diff --git a/app/assets/javascripts/app/lib/app_post/auth.js.coffee b/app/assets/javascripts/app/lib/app_post/auth.js.coffee index cc728c952..9a29ab087 100644 --- a/app/assets/javascripts/app/lib/app_post/auth.js.coffee +++ b/app/assets/javascripts/app/lib/app_post/auth.js.coffee @@ -83,6 +83,10 @@ class App.Auth for key, value of data.session App.Session.set( key, value ) + # refresh default collections + for key, value of data.default_collections + App[key].refresh( value, options: { clear: true } ) + App.Event.trigger( 'auth', data.session ) # init of i18n @@ -93,10 +97,6 @@ class App.Auth locale = window.navigator.userLanguage || window.navigator.language || 'en' App.i18n.set( locale ) - # refresh default collections - for key, value of data.default_collections - App[key].refresh( value, options: { clear: true } ) - App.Event.trigger( 'auth:login', data.session ) App.Event.trigger( 'ui:rerender' ) diff --git a/app/assets/javascripts/app/lib/app_post/task_manager.js.coffee b/app/assets/javascripts/app/lib/app_post/task_manager.js.coffee index 421559059..32c82f955 100644 --- a/app/assets/javascripts/app/lib/app_post/task_manager.js.coffee +++ b/app/assets/javascripts/app/lib/app_post/task_manager.js.coffee @@ -371,7 +371,7 @@ class _taskManagerSingleton extends App.Controller # reopen tasks App.Event.trigger 'taskbar:init' - task_count = 0 + task_count = 1 for task in @allTasks task_count += 1 console.log('START', task)