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 4a710a3d1..dc772333e 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 @@ -317,7 +317,7 @@ class _taskManagerSingleton extends App.Controller @TaskbarIdInt taskUpdate: (task) -> - @log 'notice', "UPDATE task #{task.id}", task + #@log 'notice', "UPDATE task #{task.id}", task @tasksToUpdate[ task.key ] = 'toUpdate' App.Event.trigger 'task:render' diff --git a/app/assets/javascripts/app/lib/app_post/websocket.js.coffee b/app/assets/javascripts/app/lib/app_post/websocket.js.coffee index 6b944da80..21bcf309d 100644 --- a/app/assets/javascripts/app/lib/app_post/websocket.js.coffee +++ b/app/assets/javascripts/app/lib/app_post/websocket.js.coffee @@ -151,20 +151,20 @@ class _webSocketSingleton extends App.Controller ping: => return if @backend is 'ajax' - @log 'debug', 'send websockend ping' + @log 'debug', 'send websocket ping' @send( { action: 'ping' } ) # check if ping is back within 2 min App.Delay.clear 'websocket-ping-check', 'ws' check = => - @log 'notice', 'no websockend ping response, reconnect...' + @log 'notice', 'no websocket ping response, reconnect...' @close() App.Delay.set check, 90000, 'websocket-ping-check', 'ws' pong: -> return if @backend is 'ajax' - @log 'debug', 'received websockend ping' + @log 'debug', 'received websocket ping' # test again after 1 min App.Delay.set @ping, 60000, 'websocket-pong', 'ws' diff --git a/app/controllers/tickets_controller.rb b/app/controllers/tickets_controller.rb index 7e1005213..ab8dc8fa1 100644 --- a/app/controllers/tickets_controller.rb +++ b/app/controllers/tickets_controller.rb @@ -277,8 +277,8 @@ class TicketsController < ApplicationController links.each { |item| link_list.push item if item['link_object'] == 'Ticket' - ticket = Ticket.lookup( :id => item['link_object_value'] ) - assets = ticket.assets(assets) + linked_ticket = Ticket.lookup( :id => item['link_object_value'] ) + assets = linked_ticket.assets(assets) end }