From 6010dfe9ab14f1960ac27875080f4883f84fdb41 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Fri, 5 Oct 2012 09:10:14 +0200
Subject: [PATCH] Fixed ticket history.

---
 .../app/controllers/agent_ticket_history.js.coffee       | 5 +++++
 app/assets/javascripts/app/lib/collection.js.coffee      | 9 +++++++--
 .../javascripts/app/views/agent_ticket_history.jst.eco   | 3 ++-
 app/controllers/tickets_controller.rb                    | 2 ++
 4 files changed, 16 insertions(+), 3 deletions(-)

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'] %>
-    <span class="user-data" data-id="<%= object['created_by']['id'] %>"><%= object['created_by']['realname'] %></span> - <%= object['created_at'] %> - <%= object['humanTime'] %>
+    <span class="user-data" data-id="<%= object['created_by']['id'] %>"><%= object['created_by']['realname'] %></span> -
+    <span class="humanTimeFromNow" data-time="<%- object['created_at'] %>">?</span>
     <ul>
   <% end %>
     <li>
diff --git a/app/controllers/tickets_controller.rb b/app/controllers/tickets_controller.rb
index f7ba7ab79..7adda561b 100644
--- a/app/controllers/tickets_controller.rb
+++ b/app/controllers/tickets_controller.rb
@@ -158,6 +158,8 @@ class TicketsController < ApplicationController
 
     # get related users
     users = {}
+    users[ ticket.owner_id ] = User.user_data_full( ticket.owner_id )
+    users[ ticket.customer_id ] = User.user_data_full( ticket.customer_id )
     history.each do |item|
       users[ item['created_by_id'] ] = User.user_data_full( item['created_by_id'] )
       if item['history_object'] == 'Ticket::Article'