From 5949a9e1988c082cc7453ba2ea65be0c3737a434 Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Tue, 20 Nov 2018 17:02:22 -0300 Subject: [PATCH] Resolve resources without initial user since never will reach the resources to avoid application halt --- addon/mixins/application-route.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addon/mixins/application-route.coffee b/addon/mixins/application-route.coffee index 9df60b7..d3b10bc 100644 --- a/addon/mixins/application-route.coffee +++ b/addon/mixins/application-route.coffee @@ -30,14 +30,14 @@ export default Ember.Mixin.create ApplicationRouteMixin, _loadCurrentUser: (transition) -> #if userId = @get('session.data.authenticated.user_id') if transition?.targetName is 'login' # don't load current user on login page - @get('initial_resources_reject')('Please login') + @get('initial_resources_resolve')() return @get('store').queryRecord('user', me: true).then (user) => @set 'router.globals.current_user', user @current_user_loaded user # overloadable , => @set 'router.globals.current_user', null - @get('initial_resources_resolve')() # no initial resources without user, do not halt application propagation + @get('initial_resources_resolve')() # no initial resources without user, do not halt application propagation (login page) @transitionTo('login') actions: