diff --git a/app/assets/javascripts/app/controllers/agent_ticket_zoom.js.coffee b/app/assets/javascripts/app/controllers/agent_ticket_zoom.js.coffee index 2c67be55c..80c534ee8 100644 --- a/app/assets/javascripts/app/controllers/agent_ticket_zoom.js.coffee +++ b/app/assets/javascripts/app/controllers/agent_ticket_zoom.js.coffee @@ -34,6 +34,9 @@ class TicketZoom extends App.Controller @fetch( @ticket_id, false) @interval( update, 30000, @key, 'ticket_zoom' ) + url: => + '#ticket/zoom/' + @ticket.id + activate: => @navupdate '#' @title 'Ticket Zoom ' + @ticket.number diff --git a/app/assets/javascripts/app/controllers/task_widget.js.coffee b/app/assets/javascripts/app/controllers/task_widget.js.coffee index cc4c0a282..bd4dd172f 100644 --- a/app/assets/javascripts/app/controllers/task_widget.js.coffee +++ b/app/assets/javascripts/app/controllers/task_widget.js.coffee @@ -50,12 +50,13 @@ class App.TaskWidget extends App.Controller @render() # navigate to next task if needed - if active_is_closed + if active_is_closed && !_.isEmpty( tasks_all ) for key, task of tasks_all task_last = task if task_last - @navigate task_last.url - if _.isEmpty( tasks_all ) - @navigate '#' + @navigate task_last.worker.url() + return + if _.isEmpty( tasks_all ) + @navigate '#' App.Config.set( 'task', App.TaskWidget, 'Widgets' ) 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 33515ad08..df376940d 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 @@ -63,7 +63,6 @@ class _Singleton extends Spine.Module type: type type_id: type_id params: params - url: window.location.hash worker: a active: true @tasks[@task_count] = task @@ -73,7 +72,6 @@ class _Singleton extends Spine.Module remove: ( key ) => if @tasks[key] - console.log('rrrelease', @tasks[key], @tasks[key].worker) @tasks[key].worker.release() delete @tasks[key] App.Event.trigger 'ui:rerender'