diff options
| author | Luc Donnet | 2018-02-01 14:05:10 +0100 |
|---|---|---|
| committer | GitHub | 2018-02-01 14:05:10 +0100 |
| commit | b7680876c8f13486dbc58b4a6ce7ffe519bfb897 (patch) | |
| tree | 427da4d99c41ef091c486838b6502b5c0aeced78 /app/controllers | |
| parent | b3d46e56c65b9dcfee9c8a81fd567cba956c63fc (diff) | |
| parent | 630f4d9cbda9b0d5e7ea301f605e893ebd4e263b (diff) | |
| download | chouette-core-b7680876c8f13486dbc58b4a6ce7ffe519bfb897.tar.bz2 | |
Merge pull request #260 from af83/5718-show-times-in-vehiclejourneys-index
5718 Show times at stops in ReferentialVehicleJourneys#index
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/referential_vehicle_journeys_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/referential_vehicle_journeys_controller.rb b/app/controllers/referential_vehicle_journeys_controller.rb index b133602bc..a199157dd 100644 --- a/app/controllers/referential_vehicle_journeys_controller.rb +++ b/app/controllers/referential_vehicle_journeys_controller.rb @@ -23,6 +23,8 @@ class ReferentialVehicleJourneysController < ChouetteController @vehicle_journeys ||= @q.result.order(:published_journey_name).includes(:vehicle_journey_at_stops).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 @all_stop_areas = Chouette::StopArea.where("id IN (#{@referential.vehicle_journeys.joins(:stop_areas).select("stop_areas.id").to_sql})").distinct + stop_area_ids = params[:q][:stop_area_ids].select(&:present?) + @filters_stop_areas = Chouette::StopArea.find(stop_area_ids) if stop_area_ids.present? && stop_area_ids.size <= 2 end end |
