bterkuile/ember-cli-dunlop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add comment

Browse Source
This commit is contained in:
Benjamin ter Kuile
2018-11-20 18:32:57 -03:00
parent 5949a9e198
commit a8a926c4e7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addon/mixins/application-route.coffee
+1 -1
View File
@@ -30,7 +30,7 @@ export default Ember.Mixin.create ApplicationRouteMixin,
_loadCurrentUser: (transition) -> _loadCurrentUser: (transition) ->
#if userId = @get('session.data.authenticated.user_id') #if userId = @get('session.data.authenticated.user_id')
if transition?.targetName is 'login' # don't load current user on login page if transition?.targetName is 'login' # don't load current user on login page
@get('initial_resources_resolve')() @get('initial_resources_resolve')() # do not halt propagation
return return
@get('store').queryRecord('user', me: true).then (user) => @get('store').queryRecord('user', me: true).then (user) =>
@set 'router.globals.current_user', user @set 'router.globals.current_user', user