diff --git a/app/assets/javascripts/app/controllers/users.coffee b/app/assets/javascripts/app/controllers/users.coffee index 444e2029d..9432df550 100644 --- a/app/assets/javascripts/app/controllers/users.coffee +++ b/app/assets/javascripts/app/controllers/users.coffee @@ -78,7 +78,7 @@ class Index extends App.Controller $('#app').hide().attr('style', 'display: none!important') @delay( => - App.Auth._logout() + App.Auth._logout(false) @ajax( id: 'user_switch' type: 'GET' diff --git a/app/assets/javascripts/app/controllers/widget/switch_back_to_user.coffee b/app/assets/javascripts/app/controllers/widget/switch_back_to_user.coffee index b5dd14785..35bdd3f66 100644 --- a/app/assets/javascripts/app/controllers/widget/switch_back_to_user.coffee +++ b/app/assets/javascripts/app/controllers/widget/switch_back_to_user.coffee @@ -36,7 +36,7 @@ class Widget extends App.ControllerWidgetOnDemand $('#app').hide().attr('style', 'display: none!important') @delay( => - App.Auth._logout() + App.Auth._logout(false) @ajax( id: 'user_switch_back' type: 'GET' diff --git a/app/assets/javascripts/app/lib/app_post/auth.coffee b/app/assets/javascripts/app/lib/app_post/auth.coffee index 37bfcdbc7..d0878d2ff 100644 --- a/app/assets/javascripts/app/lib/app_post/auth.coffee +++ b/app/assets/javascripts/app/lib/app_post/auth.coffee @@ -132,8 +132,8 @@ class App.Auth App.Event.trigger('ui:rerender') - @_logout: (data) -> - App.Log.debug 'Auth', '_logout', data + @_logout: (rerender = true) -> + App.Log.debug 'Auth', '_logout' App.Ajax.abortAll() @@ -142,7 +142,8 @@ class App.Auth App.Event.trigger('auth') App.Event.trigger('auth:logout') - App.Event.trigger('ui:rerender') + if rerender + App.Event.trigger('ui:rerender') App.Event.trigger('clearStore') @_loginError: ->