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

Re-render task on renderScreenError(), renderScreenNotFound() and renderScreenUnauthorized() automatically.

Browse source
This commit is contained in:
Martin Edenhofer 2016-04-01 08:20:52 +02:00
parent 1836522695
commit ada5538e1b
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/app/controllers/_application_controller.coffee
View file

@ -551,12 +551,15 @@ class App.Controller extends Spine.Controller
@clearDelay(@initLoadingDoneDelay) @clearDelay(@initLoadingDoneDelay)
renderScreenError: (data) -> renderScreenError: (data) ->
App.TaskManager.touch(@task_key)
@html App.view('generic/error/generic')(data) @html App.view('generic/error/generic')(data)
renderScreenNotFound: (data) -> renderScreenNotFound: (data) ->
App.TaskManager.touch(@task_key)
@html App.view('generic/error/not_found')(data) @html App.view('generic/error/not_found')(data)
renderScreenUnauthorized: (data) -> renderScreenUnauthorized: (data) ->
App.TaskManager.touch(@task_key)
@html App.view('generic/error/unauthorized')(data) @html App.view('generic/error/unauthorized')(data)
locationVerify: (e) => locationVerify: (e) =>

2
app/assets/javascripts/app/controllers/_application_controller_generic.coffee
View file

@ -116,8 +116,6 @@ class App.ControllerGenericIndex extends App.Controller
@log 'error', 'ajax', msg.status @log 'error', 'ajax', msg.status
if msg.status is 401 if msg.status is 401
@log 'error', 'ajax', rec, msg, msg.status @log 'error', 'ajax', rec, msg, msg.status
# @navigate @pageData.navupdate
# alert('relogin')
@navigate 'login' @navigate 'login'
# execute fetch # execute fetch

3
app/assets/javascripts/app/controllers/ticket_zoom.coffee
View file

@ -210,9 +210,6 @@ class App.TicketZoom extends App.Controller
detail: detail detail: detail
objectName: 'Ticket' objectName: 'Ticket'
) )
# update taskbar with new meta data
App.TaskManager.touch(@task_key)
) )