diff options
| author | Alban Peignier | 2018-05-10 22:17:03 +0200 |
|---|---|---|
| committer | GitHub | 2018-05-10 22:17:03 +0200 |
| commit | 764aa8a93bd3e25a83b3db70892ca06304edaa9c (patch) | |
| tree | b681730cec81ee6b721e8148f3fbcab691c3689b /app/controllers | |
| parent | 093599f1c2e75ba2a4e3e9e8a6aa2cf665919886 (diff) | |
| parent | 3364755e26c5a4a54a6de6080bf1177ee03c7183 (diff) | |
| download | chouette-core-764aa8a93bd3e25a83b3db70892ca06304edaa9c.tar.bz2 | |
Merge pull request #555 from af83/6923-consolidated-offer
Display consolidated offer. Fixes #6923
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/referential_vehicle_journeys_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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 |