Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed release of active controllers on logout.

Browse source
This commit is contained in:
Martin Edenhofer 2013-06-25 15:59:52 +02:00
parent 951b3d1b6a
commit 167f41fc6b
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/controllers/logout.js.coffee
View file

@ -13,7 +13,9 @@ class Index extends App.ControllerContent
App.Event.trigger( 'ui:rerender' ) App.Event.trigger( 'ui:rerender' )
# redirect to login # redirect to login
redirect = =>
@navigate 'login' @navigate 'login'
@delay redirect, 150
App.Config.set( 'logout', Index, 'Routes' ) App.Config.set( 'logout', Index, 'Routes' )
App.Config.set( 'Logout', { prio: 1800, parent: '#current_user', name: 'Sign out', target: '#logout', divider: true, role: [ 'Agent', 'Customer' ] }, 'NavBarRight' ) App.Config.set( 'Logout', { prio: 1800, parent: '#current_user', name: 'Sign out', target: '#logout', divider: true, role: [ 'Agent', 'Customer' ] }, 'NavBarRight' )

6
app/assets/javascripts/app/lib/app_post/task_manager.js.coffee
View file

@ -80,11 +80,11 @@ class _taskManagerSingleton extends App.Controller
# render on logout # render on logout
App.Event.bind 'auth:logout', => App.Event.bind 'auth:logout', =>
for task in @all for task in @allTasks
worker = @worker( task.key ) worker = @worker( task.key )
if worker && worker.release if worker && worker.release
worker.release() worker.release()
@workersStarted[ task.key ] = false delete @workersStarted[ task.key ]
@reset() @reset()
# send updates to server # send updates to server
@ -256,7 +256,7 @@ class _taskManagerSingleton extends App.Controller
worker = @worker( key ) worker = @worker( key )
if worker && worker.release if worker && worker.release
worker.release() worker.release()
@workersStarted[ key ] = false delete @workersStarted[ key ]
@taskDestroy(task) @taskDestroy(task)
notify: ( key ) => notify: ( key ) =>