From a3ea6c8ec8cd1afde90345da9fe927858d82d365 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Mon, 22 Sep 2014 00:30:15 +0200 Subject: [PATCH] Moved to ticket state for colors. --- .../app/controllers/ticket_zoom.js.coffee | 2 +- app/assets/javascripts/app/models/ticket.js.coffee | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee index c7617aba9..8d8697d1d 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom.js.coffee @@ -41,7 +41,7 @@ class App.TicketZoom extends App.Controller @ticket = App.Ticket.fullLocal( @ticket.id ) meta.head = @ticket.title meta.title = '#' + @ticket.number + ' - ' + @ticket.title - meta.class = "level-#{@ticket.priority_id}" + meta.class = "level-#{@ticket.level()}" meta url: => diff --git a/app/assets/javascripts/app/models/ticket.js.coffee b/app/assets/javascripts/app/models/ticket.js.coffee index 78fd83a7f..996145b43 100644 --- a/app/assets/javascripts/app/models/ticket.js.coffee +++ b/app/assets/javascripts/app/models/ticket.js.coffee @@ -27,11 +27,20 @@ class App.Ticket extends App.Model uiUrl: -> '#ticket/zoom/' + @id + level: (user) -> + state = App.TicketState.find( @state_id ) + level = 1 + if state.name is 'new' || state.name is 'open' + level = 2 + else if state.name is 'pending' + level = 3 + level + icon: (user) -> - "priority icon level-#{ @priority_id }" + "priority icon level-#{ @level() }" iconTitle: (user) -> - App.TicketPriority.find( @priority_id ).displayName() + App.TicketState.find( @state_id ).displayName() iconActivity: (user) -> if @owner_id == user.id