From 195315cc7b214655e3620fc1b4a981ae6c317249 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Wed, 24 Sep 2014 07:52:02 +0200 Subject: [PATCH 1/3] Removed debug log. --- app/assets/javascripts/app/lib/app_post/task_manager.js.coffee | 2 +- app/assets/javascripts/app/models/_application_model.js.coffee | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 f8cf74c4e..b4af7f288 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 @@ -318,7 +318,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/models/_application_model.js.coffee b/app/assets/javascripts/app/models/_application_model.js.coffee index 1b412bbe4..295ad3764 100644 --- a/app/assets/javascripts/app/models/_application_model.js.coffee +++ b/app/assets/javascripts/app/models/_application_model.js.coffee @@ -164,7 +164,7 @@ class App.Model extends Spine.Model # if no screen is given or no attribute has this screen - use default attributes if !screen || _.isEmpty( attributesNew ) - console.log(attributesNew) + #console.log(attributesNew) for attribute in attributes attributesNew[ attribute.name ] = attribute From d7ae804500e1daade2537452098d7dae7d11dce2 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Wed, 24 Sep 2014 21:37:06 +0200 Subject: [PATCH 2/3] Fixed tag delivery. --- app/controllers/tickets_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/tickets_controller.rb b/app/controllers/tickets_controller.rb index 12a5654b2..627aefc1a 100644 --- a/app/controllers/tickets_controller.rb +++ b/app/controllers/tickets_controller.rb @@ -270,8 +270,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 } From d8cec02fd8ac92a97f3d56c9f2d6f9edd78b77f8 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Wed, 24 Sep 2014 21:38:03 +0200 Subject: [PATCH 3/3] Fixed typos. --- app/assets/javascripts/app/lib/app_post/websocket.js.coffee | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 f2c9a1c03..3bb5cdc43 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'