From ada5538e1b8ef94f6d82514d1dc98206c6bf9073 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Fri, 1 Apr 2016 08:20:52 +0200
Subject: [PATCH] Re-render task on renderScreenError(), renderScreenNotFound()
 and renderScreenUnauthorized() automatically.

---
 .../javascripts/app/controllers/_application_controller.coffee | 3 +++
 .../app/controllers/_application_controller_generic.coffee     | 2 --
 app/assets/javascripts/app/controllers/ticket_zoom.coffee      | 3 ---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/app/controllers/_application_controller.coffee b/app/assets/javascripts/app/controllers/_application_controller.coffee
index e97c22c79..f810ad823 100644
--- a/app/assets/javascripts/app/controllers/_application_controller.coffee
+++ b/app/assets/javascripts/app/controllers/_application_controller.coffee
@@ -551,12 +551,15 @@ class App.Controller extends Spine.Controller
     @clearDelay(@initLoadingDoneDelay)
 
   renderScreenError: (data) ->
+    App.TaskManager.touch(@task_key)
     @html App.view('generic/error/generic')(data)
 
   renderScreenNotFound: (data) ->
+    App.TaskManager.touch(@task_key)
     @html App.view('generic/error/not_found')(data)
 
   renderScreenUnauthorized: (data) ->
+    App.TaskManager.touch(@task_key)
     @html App.view('generic/error/unauthorized')(data)
 
   locationVerify: (e) =>
diff --git a/app/assets/javascripts/app/controllers/_application_controller_generic.coffee b/app/assets/javascripts/app/controllers/_application_controller_generic.coffee
index 8e9fa7f80..08bda0a79 100644
--- a/app/assets/javascripts/app/controllers/_application_controller_generic.coffee
+++ b/app/assets/javascripts/app/controllers/_application_controller_generic.coffee
@@ -116,8 +116,6 @@ class App.ControllerGenericIndex extends App.Controller
       @log 'error', 'ajax', msg.status
       if msg.status is 401
         @log 'error', 'ajax', rec, msg, msg.status
-#        @navigate @pageData.navupdate
-#        alert('relogin')
         @navigate 'login'
 
     # execute fetch
diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.coffee
index e14078101..06fafbb9d 100644
--- a/app/assets/javascripts/app/controllers/ticket_zoom.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_zoom.coffee
@@ -210,9 +210,6 @@ class App.TicketZoom extends App.Controller
             detail:     detail
             objectName: 'Ticket'
           )
-
-        # update taskbar with new meta data
-        App.TaskManager.touch(@task_key)
     )