From 8ebd1976f68cc977391142b20cccd13cdb8c7f16 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Mon, 12 Jan 2015 01:26:43 +0100 Subject: [PATCH] Task color is now based on ticket state type, not ticket state. --- app/assets/javascripts/app/models/ticket.js.coffee | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/app/models/ticket.js.coffee b/app/assets/javascripts/app/models/ticket.js.coffee index d22a8c701..9ed81ad64 100644 --- a/app/assets/javascripts/app/models/ticket.js.coffee +++ b/app/assets/javascripts/app/models/ticket.js.coffee @@ -16,6 +16,7 @@ class App.Ticket extends App.Model { name: 'last_contact_customer', display: 'Last contact (Customer)', type: 'time', null: true, style: 'width: 12%', parentClass: 'noTruncate' }, { name: 'first_response', display: 'First response', type: 'time', null: true, style: 'width: 12%', parentClass: 'noTruncate' }, { name: 'close_time', display: 'Close time', type: 'time', null: true, style: 'width: 12%', parentClass: 'noTruncate' }, + { name: 'pending_time', display: 'Pending Time', type: 'time', null: true, style: 'width: 12%', parentClass: 'noTruncate' }, { name: 'escalation_time', display: 'Escalation', type: 'time', null: true, style: 'width: 12%', class: 'escalation', parentClass: 'noTruncate' }, { name: 'article_count', display: 'Article#', style: 'width: 12%' }, { name: 'created_by_id', display: 'Created by', relation: 'User', readonly: 1 }, @@ -29,10 +30,11 @@ class App.Ticket extends App.Model level: (user) -> state = App.TicketState.find( @state_id ) + stateType = App.TicketStateType.find( state.state_type_id ) level = 1 - if state.name is 'new' || state.name is 'open' + if stateType.name is 'new' || stateType.name is 'open' level = 2 - else if state.name is 'pending' + else if stateType.name is 'pending reminder' || stateType.name is 'pending action' level = 3 level