diff options
| author | Zog | 2018-05-04 16:39:51 +0200 |
|---|---|---|
| committer | Zog | 2018-05-04 16:39:51 +0200 |
| commit | 08aa082e941db7e23d91edb8e48bead2b72e9fe3 (patch) | |
| tree | af79f7f469fdce46b4b48e87fd5e25b4ace756f0 /app/controllers | |
| parent | db65c0ffc7ccc76a144689ec3db43fbc2e61ee82 (diff) | |
| download | chouette-core-08aa082e941db7e23d91edb8e48bead2b72e9fe3.tar.bz2 | |
Refs #6923; Implement a consolidated view
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 |
