Refs #5500 @3h; Add filters on ReferentialVJ#index

To enable users to filter on stop areas

1 files changed, 4 insertions, 1 deletions

diff --git a/app/controllers/referential_vehicle_journeys_controller.rb b/app/controllers/referential_vehicle_journeys_controller.rb
index 217fb9629..f93de29cc 100644
--- a/app/controllers/referential_vehicle_journeys_controller.rb
+++ b/app/controllers/referential_vehicle_journeys_controller.rb
@@ -10,9 +10,12 @@ class ReferentialVehicleJourneysController < ChouetteController
   private
 
   def collection
-    @q ||= end_of_association_chain.ransack(params[:q])
+    @q ||= end_of_association_chain
+    @q = @q.with_stop_area_ids(params[:q][:stop_area_ids]) if params[:q] && params[:q][:stop_area_ids]
+    @q = @q.ransack(params[:q])
     @vehicle_journeys ||= @q.result.order(:published_journey_name).includes(:vehicle_journey_at_stops).paginate page: params[:page], 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
   end
 
 end