From 3d2619672aa18361c3931ffdf9dd217311908a06 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Thu, 26 Jun 2014 06:17:24 +0200
Subject: [PATCH] Moved to new table api.

---
 .../_application_controller_table.js.coffee   |  3 +-
 .../controllers/agent_ticket_merge.js.coffee  | 36 +++----------------
 2 files changed, 6 insertions(+), 33 deletions(-)

diff --git a/app/assets/javascripts/app/controllers/_application_controller_table.js.coffee b/app/assets/javascripts/app/controllers/_application_controller_table.js.coffee
index 76b0f939a..263aeb88e 100644
--- a/app/assets/javascripts/app/controllers/_application_controller_table.js.coffee
+++ b/app/assets/javascripts/app/controllers/_application_controller_table.js.coffee
@@ -272,6 +272,7 @@ class App.ControllerTable extends App.Controller
 
     time = =>
       @frontendTimeUpdate()
-    @delay(time, 80)
+    @delay(time, 80) # to show time immediately for normal tables
+    @delay(time, 280) # to show time immediately for tables in modal dialog
 
     table
diff --git a/app/assets/javascripts/app/controllers/agent_ticket_merge.js.coffee b/app/assets/javascripts/app/controllers/agent_ticket_merge.js.coffee
index c353211df..cf5c3e263 100644
--- a/app/assets/javascripts/app/controllers/agent_ticket_merge.js.coffee
+++ b/app/assets/javascripts/app/controllers/agent_ticket_merge.js.coffee
@@ -32,22 +32,8 @@ class App.TicketMerge extends App.ControllerModal
         ticketItem = App.Ticket.retrieve( ticket_id )
         list.push ticketItem
     new App.ControllerTable(
-      el:                @el.find('#ticket-merge-customer-tickets'),
-      overview_extended: [
-        { name: 'number',                 link: true },
-        { name: 'title',                  link: true },
-#        { name: 'customer',               class: 'user-popover', data: { id: true } },
-        { name: 'state',                  translate: true },
-#        { name: 'priority',               translate: true },
-        { name: 'group' },
-#        { name: 'owner',                  class: 'user-popover', data: { id: true } },
-        { name: 'created_at',             callback: @humanTime },
-#        { name: 'last_contact',           callback: @frontendTime },
-#        { name: 'last_contact_agent',     callback: @frontendTime },
-#        { name: 'last_contact_customer',  callback: @frontendTime },
-#        { name: 'first_response',         callback: @frontendTime },
-#        { name: 'close_time',             callback: @frontendTime },
-      ],
+      el:       @el.find('#ticket-merge-customer-tickets'),
+      overview: [ 'number', 'title', 'state', 'group', 'created_at' ]
       model:    App.Ticket,
       objects:  list,
       radio:    true,
@@ -59,22 +45,8 @@ class App.TicketMerge extends App.ControllerModal
         ticketItem = App.Ticket.retrieve( ticket_id )
         list.push ticketItem
     new App.ControllerTable(
-      el:                @el.find('#ticket-merge-recent-tickets'),
-      overview_extended: [
-        { name: 'number',                 link: true },
-        { name: 'title',                  link: true },
-#        { name: 'customer',               class: 'user-popover', data: { id: true } },
-        { name: 'state',                  translate: true },
-#        { name: 'priority',               translate: true },
-        { name: 'group' },
-#        { name: 'owner',                  class: 'user-popover', data: { id: true } },
-        { name: 'created_at',             callback: @humanTime },
-#        { name: 'last_contact',           callback: @frontendTime },
-#        { name: 'last_contact_agent',     callback: @frontendTime },
-#        { name: 'last_contact_customer',  callback: @frontendTime },
-#        { name: 'first_response',         callback: @frontendTime },
-#        { name: 'close_time',             callback: @frontendTime },
-      ],
+      el:       @el.find('#ticket-merge-recent-tickets'),
+      overview: [ 'number', 'title', 'state', 'group', 'created_at' ]
       model:    App.Ticket,
       objects:  list,
       radio:    true,