Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Moved to new table api.

Browse source
This commit is contained in:
Martin Edenhofer 2014-06-26 06:17:24 +02:00
parent dc32d6a0dd
commit 3d2619672a
2 changed files with 6 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/app/controllers/_application_controller_table.js.coffee
View file

@ -272,6 +272,7 @@ class App.ControllerTable extends App.Controller
time = => time = =>
@frontendTimeUpdate() @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 table

32
app/assets/javascripts/app/controllers/agent_ticket_merge.js.coffee
View file

@ -33,21 +33,7 @@ class App.TicketMerge extends App.ControllerModal
list.push ticketItem list.push ticketItem
new App.ControllerTable( new App.ControllerTable(
el: @el.find('#ticket-merge-customer-tickets'), el: @el.find('#ticket-merge-customer-tickets'),
overview_extended: [ overview: [ 'number', 'title', 'state', 'group', 'created_at' ]
{ 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 },
],
model: App.Ticket, model: App.Ticket,
objects: list, objects: list,
radio: true, radio: true,
@ -60,21 +46,7 @@ class App.TicketMerge extends App.ControllerModal
list.push ticketItem list.push ticketItem
new App.ControllerTable( new App.ControllerTable(
el: @el.find('#ticket-merge-recent-tickets'), el: @el.find('#ticket-merge-recent-tickets'),
overview_extended: [ overview: [ 'number', 'title', 'state', 'group', 'created_at' ]
{ 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 },
],
model: App.Ticket, model: App.Ticket,
objects: list, objects: list,
radio: true, radio: true,