From 15f4c5735635141a30f186c919fe6fa8544ddd21 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Mon, 30 Jul 2012 17:16:35 +0200
Subject: [PATCH] Fixed not working ticket overview.

---
 .../app/controllers/_dashboard/ticket.js.coffee    | 11 ++++++-----
 .../app/controllers/agent_ticket_view.js.coffee    | 14 +++++---------
 lib/web_socket.rb                                  |  3 +++
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/app/controllers/_dashboard/ticket.js.coffee b/app/assets/javascripts/app/controllers/_dashboard/ticket.js.coffee
index a77cfb214..5e4759bc4 100644
--- a/app/assets/javascripts/app/controllers/_dashboard/ticket.js.coffee
+++ b/app/assets/javascripts/app/controllers/_dashboard/ticket.js.coffee
@@ -72,11 +72,12 @@ class App.DashboardTicket extends App.Controller
     @render( data )
 
   render: (data) ->
-    
+
     @overview      = data.overview
     @tickets_count = data.tickets_count
     @tickets       = data.tickets
-    
+    @ticket_list   = data.ticket_list
+
     pages_total =  parseInt( ( @tickets_count / @overview.view.d.per_page ) + 0.99999 ) || 1
     html = App.view('dashboard/ticket')(
       overview:    @overview,
@@ -93,8 +94,8 @@ class App.DashboardTicket extends App.Controller
     i = start
     while i < end
       i = i + 1
-      if @tickets[ i - 1 ]
-        @tickets_in_table.push @tickets[ i - 1 ]
+      if @ticket_list[ i - 1 ]
+        @tickets_in_table.push App.Ticket.find( @ticket_list[ i - 1 ] )
 
     shown_all_attributes = @ticketTableAttributes( App.Overview.find(@overview.id).view.d.overview )
     table = @table(
@@ -104,7 +105,7 @@ class App.DashboardTicket extends App.Controller
       checkbox:          false,
     )
 
-    if _.isEmpty(@tickets)
+    if _.isEmpty(@ticket_list)
       table = ''
       table = '-none-'
 
diff --git a/app/assets/javascripts/app/controllers/agent_ticket_view.js.coffee b/app/assets/javascripts/app/controllers/agent_ticket_view.js.coffee
index 5548563a5..6359c9f9a 100644
--- a/app/assets/javascripts/app/controllers/agent_ticket_view.js.coffee
+++ b/app/assets/javascripts/app/controllers/agent_ticket_view.js.coffee
@@ -48,6 +48,7 @@ class Index extends App.Controller
       @overview      = cache.overview
       @tickets_count = cache.tickets_count
       @tickets       = cache.tickets
+      @ticket_list   = cache.ticket_list
       @load(cache)
 
     # get data
@@ -86,14 +87,9 @@ class Index extends App.Controller
     # load ticket collection
     @loadCollection( type: 'Ticket', data: data.tickets )
 
-    # remember ticket order
-    if @start_page is 1
-      @tickets = data.tickets
-    else
-      @tickets = @tickets.concat( data.tickets )
-
-    # remember ticket count
-    @tickets_count = data.tickets_count
+    @ticket_list_show = []
+    for ticket_id in @ticket_list
+      @ticket_list_show.push App.Ticket.find(ticket_id)
 
     # remeber bulk attributes
     @bulk = data.bulk
@@ -163,7 +159,7 @@ class Index extends App.Controller
       table = @table(
         overview_extended: shown_all_attributes,
         model:             App.Ticket,
-        objects:           @tickets,
+        objects:           @ticket_list_show,
         checkbox:          true,
       )
     
diff --git a/lib/web_socket.rb b/lib/web_socket.rb
index 98c5da326..68178ac86 100644
--- a/lib/web_socket.rb
+++ b/lib/web_socket.rb
@@ -100,7 +100,9 @@ module Session
 puts 'push overview ' + overview.meta[:url].to_s
             users = {}
             tickets = []
+            ticket_list = []
             overview_data[:tickets].each {|ticket|
+              ticket_list.push ticket.id
               self.jobs_ticket( ticket.id, state_client_ids[client_id], tickets, users )
             }
 
@@ -108,6 +110,7 @@ puts 'push overview ' + overview.meta[:url].to_s
             Session.transaction( client_id, {
               :data   => {
                 :overview      => overview_data[:overview],
+                :ticket_list   => ticket_list,
                 :tickets       => tickets,
                 :tickets_count => overview_data[:tickets_count],
                 :users         => users,