From 08aa082e941db7e23d91edb8e48bead2b72e9fe3 Mon Sep 17 00:00:00 2001
From: Zog
Date: Fri, 4 May 2018 16:39:51 +0200
Subject: Refs #6923; Implement a consolidated view

---
 app/controllers/referential_vehicle_journeys_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/referential_vehicle_journeys_controller.rb b/app/controllers/referential_vehicle_journeys_controller.rb
index 14f7909b9..111d39c2b 100644
--- a/app/controllers/referential_vehicle_journeys_controller.rb
+++ b/app/controllers/referential_vehicle_journeys_controller.rb
@@ -42,9 +42,9 @@ class ReferentialVehicleJourneysController < ChouetteController
     @q = @q.ransack(params[:q])
     @vehicle_journeys ||= @q.result
     @vehicle_journeys = parse_order @vehicle_journeys
-    @vehicle_journeys = @vehicle_journeys.paginate page: params[:page], per_page: params[:per_page] || 10
     @all_companies = Chouette::Company.where("id IN (#{@referential.vehicle_journeys.select(:company_id).to_sql})").distinct
-
+    @consolidated = ReferentialConsolidated.new @vehicle_journeys, params
+    @vehicle_journeys = @vehicle_journeys.paginate page: params[:page], per_page: params[:per_page] || 10
   end
 
   def parse_order scope
-- 
cgit v1.2.3