From 3585ec53bd6591f8f32a65efb20ea83f4d696606 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Mon, 29 Sep 2014 13:46:54 +0200 Subject: [PATCH] Added class noTruncate to time stamps in table. --- .../javascripts/app/models/ticket.js.coffee | 22 +++++++++---------- .../app/views/generic/table.jst.eco | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/assets/javascripts/app/models/ticket.js.coffee b/app/assets/javascripts/app/models/ticket.js.coffee index 901da332b..d16599846 100644 --- a/app/assets/javascripts/app/models/ticket.js.coffee +++ b/app/assets/javascripts/app/models/ticket.js.coffee @@ -8,20 +8,20 @@ class App.Ticket extends App.Model { name: 'organization_id', display: 'Organization', relation: 'Organization', tagreadonly: 1 }, { name: 'group_id', display: 'Group', tag: 'select', multiple: false, limit: 100, null: false, relation: 'Group', style: 'width: 10%', edit: true }, { name: 'owner_id', display: 'Owner', tag: 'select', multiple: false, limit: 100, null: true, relation: 'User', style: 'width: 12%', edit: true }, - { name: 'title', display: 'Title', tag: 'input', type: 'text', limit: 100, null: false }, - { name: 'state_id', display: 'State', tag: 'select', multiple: false, null: false, relation: 'TicketState', default: 'new', class: 'medium', style: 'width: 12%', edit: true, customer: true, }, - { name: 'priority_id', display: 'Priority', tag: 'select', multiple: false, null: false, relation: 'TicketPriority', default: '2 normal', class: 'medium', style: 'width: 12%', edit: true, customer: true, }, - { name: 'last_contact', display: 'Last contact', type: 'time', null: true, style: 'width: 12%' }, - { name: 'last_contact_agent', display: 'Last contact (Agent)', type: 'time', null: true, style: 'width: 12%' }, - { name: 'last_contact_customer', display: 'Last contact (Customer)', type: 'time', null: true, style: 'width: 12%' }, - { name: 'first_response', display: 'First response', type: 'time', null: true, style: 'width: 12%' }, - { name: 'close_time', display: 'Close time', type: 'time', null: true, style: 'width: 12%' }, - { name: 'escalation_time', display: 'Escalation', type: 'time', null: true, style: 'width: 12%', class: 'escalation' }, + { name: 'title', display: 'Title', tag: 'input', type: 'text', limit: 100, null: false, parentClass: 'noTruncate' }, + { name: 'state_id', display: 'State', tag: 'select', multiple: false, null: false, relation: 'TicketState', default: 'new', style: 'width: 12%', edit: true, customer: true, }, + { name: 'priority_id', display: 'Priority', tag: 'select', multiple: false, null: false, relation: 'TicketPriority', default: '2 normal', style: 'width: 12%', edit: true, customer: true, }, + { name: 'last_contact', display: 'Last contact', type: 'time', null: true, style: 'width: 12%', parentClass: 'noTruncate' }, + { name: 'last_contact_agent', display: 'Last contact (Agent)', type: 'time', null: true, style: 'width: 12%', parentClass: 'noTruncate' }, + { 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: '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 }, - { name: 'created_at', display: 'Created', type: 'time', style: 'width: 12%', readonly: 1 }, + { name: 'created_at', display: 'Created', type: 'time', style: 'width: 12%', readonly: 1, parentClass: 'noTruncate' }, { name: 'updated_by_id', display: 'Updated by', relation: 'User', readonly: 1 }, - { name: 'updated_at', display: 'Updated', type: 'time', style: 'width: 12%', readonly: 1 }, + { name: 'updated_at', display: 'Updated', type: 'time', style: 'width: 12%', readonly: 1, parentClass: 'noTruncate' }, ] uiUrl: -> diff --git a/app/assets/javascripts/app/views/generic/table.jst.eco b/app/assets/javascripts/app/views/generic/table.jst.eco index 24656e12b..9e345928b 100644 --- a/app/assets/javascripts/app/views/generic/table.jst.eco +++ b/app/assets/javascripts/app/views/generic/table.jst.eco @@ -87,7 +87,7 @@ <% end %> <% end %> <% #console.log('HH', item_clone.name, item_clone.type, item_clone.translate, item_clone, object.translate(), refObject, translation) %> - + class="<%= item_clone.parentClass %>"<% end %>> <% if item_clone.link: %>target="<%= item_clone.target %>"<% end %>><% end %> <% if item_clone.translate || ( translation && !refObject && object.translate && object.translate() ) || ( translation && refObject && refObject.translate && refObject.translate() ) : %> class="<%= item_clone.class %>"<% end %>><%- @T( @P( value, item_clone ) ) %>