diff --git a/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee b/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee index a9be66fb5..93498db1a 100644 --- a/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee +++ b/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee @@ -57,12 +57,7 @@ class App.TicketCreate extends App.Controller meta: => text = App.i18n.translateInline( @article_attributes['title'] ) - if !@_initMetaDone - @_initMetaDone = true - state = App.TaskManager.get(@task_key).state - subject = state['subject'] - else - subject = @el.find('[name=subject]').val() + subject = @el.find('[name=subject]').val() if subject text = "#{text}: #{subject}" meta = diff --git a/app/assets/javascripts/app/controllers/task_widget.js.coffee b/app/assets/javascripts/app/controllers/task_widget.js.coffee index 3936f16bf..2622091ef 100644 --- a/app/assets/javascripts/app/controllers/task_widget.js.coffee +++ b/app/assets/javascripts/app/controllers/task_widget.js.coffee @@ -120,6 +120,8 @@ class Taskbar extends App.Controller tasks = App.TaskManager.all() item_list = [] for task in tasks + + # collect meta data of task for task bar item data = url: '#' id: false @@ -128,8 +130,13 @@ class Taskbar extends App.Controller worker = App.TaskManager.worker( task.key ) if worker meta = worker.meta() + + # apply meta data of controller if meta - data = meta + for key, value of meta + data[key] = value + + # collect new task bar items item = {} item.task = task item.data = data diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee index d6d6633af..e18145b67 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee @@ -36,10 +36,8 @@ class App.TicketZoom extends App.Controller meta: => meta = - url: @url() - head: '???' - title: '???' - id: @ticket_id + url: @url() + id: @ticket_id if @ticket meta.head = @ticket.title meta.title = '#' + @ticket.number + ' - ' + @ticket.title @@ -428,7 +426,7 @@ class Edit extends App.Controller @el.find('.ticket-update').parent().addClass('form-changed') @el.find('.ticket-update').parent().parent().find('.reset-message').show() App.TaskManager.update( @task_key, { 'state': currentData }) - @interval( update, 2800, 'autosave' ) + @interval( update, 3000, 'autosave' ) update: (e) => e.preventDefault() 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 84d95edf5..264cbd403 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 @@ -379,7 +379,7 @@ class _taskManagerSingleton extends App.Controller App.Delay.set( => @add(task.key, task.callback, task.params, true) - task_count * 300 + task_count * 900 undefined 'task' )