Move matrix call and fix bug for vehicle journeys index Refs #0020954

1 files changed, 5 insertions, 5 deletions

diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb
index 0e8bca9cb..848fda507 100644
--- a/app/controllers/vehicle_journeys_controller.rb
+++ b/app/controllers/vehicle_journeys_controller.rb
@@ -30,9 +30,10 @@ class VehicleJourneysController < ChouetteController
     update!(:alert => t('activerecord.errors.models.vehicle_journey.invalid_times'))
   end
 
-  def index    
+  def index  
     index! do |format|
       format.html {
+        @matrix ||= matrix
         if collection.out_of_bounds?
           redirect_to params.merge(:page => 1)
         end
@@ -44,17 +45,16 @@ class VehicleJourneysController < ChouetteController
   # overwrite inherited resources to use delete instead of destroy 
   # foreign keys will propagate deletion)
   def destroy_resource(object)
-        object.delete
+    object.delete
   end
 
   protected
   
   alias_method :vehicle_journey, :resource
-
+  
   def collection
     @q = parent.sorted_vehicle_journeys.search(params[:q])
-    @vehicle_journeys ||= @q.result.order( "vehicle_journey_at_stops.departure_time").paginate(:page => params[:page], :per_page => 8)
-    @matrix ||= matrix 
+    @vehicle_journeys ||= @q.result.order( "vehicle_journey_at_stops.departure_time").paginate(:page => params[:page], :per_page => 8) 
   end
 
   def matrix