diff --git a/app/assets/javascripts/app/controllers/agent_ticket_history.js.coffee b/app/assets/javascripts/app/controllers/agent_ticket_history.js.coffee index 791f74584..95920d010 100644 --- a/app/assets/javascripts/app/controllers/agent_ticket_history.js.coffee +++ b/app/assets/javascripts/app/controllers/agent_ticket_history.js.coffee @@ -43,4 +43,9 @@ class App.TicketHistory extends App.ControllerModal ) @modalShow() + + # enable user popups @userPopups() + + # show frontend times + @delay( @frontendTimeUpdate, 200 ) \ No newline at end of file diff --git a/app/assets/javascripts/app/lib/collection.js.coffee b/app/assets/javascripts/app/lib/collection.js.coffee index 8f71294f3..d2979b17a 100644 --- a/app/assets/javascripts/app/lib/collection.js.coffee +++ b/app/assets/javascripts/app/lib/collection.js.coffee @@ -101,7 +101,7 @@ class _Singleton find: ( type, id, callback ) -> - console.log( 'find', type, id ) +# console.log( 'find', type, id ) # if App[type].exists( id ) && !callback if App[type].exists( id ) # console.log( 'find exists', type, id ) @@ -211,7 +211,12 @@ class _Singleton App[params.type].refresh( object, options: { clear: true } ) all: (type) -> - App[type].all() + all = App[type].all() + all_complied = [] + for item in all + item_new = @find( type, item.id ) + all_complied.push item_new + return all_complied deleteAll: (type) -> App[type].deleteAll() diff --git a/app/assets/javascripts/app/views/agent_ticket_history.jst.eco b/app/assets/javascripts/app/views/agent_ticket_history.jst.eco index 700fc62a1..d857b1fb1 100644 --- a/app/assets/javascripts/app/views/agent_ticket_history.jst.eco +++ b/app/assets/javascripts/app/views/agent_ticket_history.jst.eco @@ -18,7 +18,8 @@ <% open = true %> <% last_user = object['created_by_id'] %> <% lasttime = object['created_at'] %> - <%= object['created_by']['realname'] %> - <%= object['created_at'] %> - <%= object['humanTime'] %> + <%= object['created_by']['realname'] %> - + ?