diff --git a/app/assets/javascripts/app/controllers/ticket_overview.coffee b/app/assets/javascripts/app/controllers/ticket_overview.coffee index dcd2d3b47..203325128 100644 --- a/app/assets/javascripts/app/controllers/ticket_overview.coffee +++ b/app/assets/javascripts/app/controllers/ticket_overview.coffee @@ -290,7 +290,7 @@ class Table extends App.Controller value = ' ' attribute.class = object.iconClass() attribute.link = '' - attribute.title = App.i18n.translateInline( object.iconTitle() ) + attribute.title = object.iconTitle() value new App.ControllerTable( diff --git a/app/assets/javascripts/app/controllers/ticket_zoom.coffee b/app/assets/javascripts/app/controllers/ticket_zoom.coffee index 940e956dc..def756f91 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom.coffee @@ -82,6 +82,7 @@ class App.TicketZoom extends App.Controller meta.title = '#' + @ticket.number + ' - ' + @ticket.title meta.class = "task-state-#{ @ticket.getState() }" meta.type = 'task' + meta.iconTitle = @ticket.iconTitle() meta.iconClass = @ticket.iconClass() meta diff --git a/app/assets/javascripts/app/controllers/widget/ticket_list.coffee b/app/assets/javascripts/app/controllers/widget/ticket_list.coffee index 1e8dd5e2f..616f4b978 100644 --- a/app/assets/javascripts/app/controllers/widget/ticket_list.coffee +++ b/app/assets/javascripts/app/controllers/widget/ticket_list.coffee @@ -33,7 +33,7 @@ class App.TicketList extends App.Controller value = ' ' attribute.class = object.iconClass() attribute.link = '' - attribute.title = App.i18n.translateInline( object.iconTitle() ) + attribute.title = object.iconTitle() value list = [] diff --git a/app/assets/javascripts/app/models/ticket.coffee b/app/assets/javascripts/app/models/ticket.coffee index 03dbfc6b5..f7381b11e 100644 --- a/app/assets/javascripts/app/models/ticket.coffee +++ b/app/assets/javascripts/app/models/ticket.coffee @@ -38,7 +38,13 @@ class App.Ticket extends App.Model # if ticket is escalated, overwrite state if @escalation_time && new Date( Date.parse( @escalation_time ) ) < new Date state = 'escalating' - else if stateType.name is 'pending reminder' || stateType.name is 'pending action' + else if stateType.name is 'pending reminder' + state = 'pending' + + # if ticket pending_time is reached, overwrite state + if @pending_time && new Date( Date.parse( @pending_time ) ) < new Date + state = 'open' + else if stateType.name is 'pending action' state = 'pending' state @@ -49,7 +55,13 @@ class App.Ticket extends App.Model @getState() iconTitle: -> - App.TicketState.find( @state_id ).displayName() + type = App.TicketState.find( @state_id ) + stateType = App.TicketStateType.find( type.state_type_id ) + if stateType.name is 'pending reminder' && @pending_time && new Date( Date.parse( @pending_time ) ) < new Date + return "#{App.i18n.translateInline(type.displayName())} - #{App.i18n.translateInline('reached')}" + if @escalation_time && new Date( Date.parse( @escalation_time ) ) < new Date + return "#{App.i18n.translateInline(type.displayName())} - #{App.i18n.translateInline('escalated')}" + App.i18n.translateInline(type.displayName()) iconTextClass: -> "task-state-#{ @getState() }-color" diff --git a/app/assets/javascripts/app/views/popover/ticket.jst.eco b/app/assets/javascripts/app/views/popover/ticket.jst.eco index 1f4f6803f..23a0cdc10 100644 --- a/app/assets/javascripts/app/views/popover/ticket.jst.eco +++ b/app/assets/javascripts/app/views/popover/ticket.jst.eco @@ -1,5 +1,5 @@