Resolve resources without initial user since never will reach the resources to avoid application halt

2018-11-20 17:02:22 -03:00
parent d9ed1f89c1
commit 5949a9e198
1 changed files with 2 additions and 2 deletions
@@ -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: