diff options
| author | teddywing | 2018-02-01 15:40:34 +0100 | 
|---|---|---|
| committer | GitHub | 2018-02-01 15:40:34 +0100 | 
| commit | 11e0e3fca27685a41dc2a7226275a4e8f39a49be (patch) | |
| tree | 9603d7d4f2c111f02780364a0ad372c1873e158f | |
| parent | ff3d2d5caf08f4b09d45b4b105d9180d747e7bda (diff) | |
| parent | 720d11cb7d2475277e7b79595d857f5ffef5bee1 (diff) | |
| download | chouette-core-11e0e3fca27685a41dc2a7226275a4e8f39a49be.tar.bz2 | |
Merge pull request #275 from af83/5809-referential-vehicle-journeys-index--fix-nil-error-for-s
ReferentialVehicleJourneys#index: Fix `nil` error on `stop_area_ids`
| -rw-r--r-- | app/controllers/referential_vehicle_journeys_controller.rb | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/app/controllers/referential_vehicle_journeys_controller.rb b/app/controllers/referential_vehicle_journeys_controller.rb index a199157dd..2ce28a5cc 100644 --- a/app/controllers/referential_vehicle_journeys_controller.rb +++ b/app/controllers/referential_vehicle_journeys_controller.rb @@ -23,7 +23,7 @@ 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?) +    stop_area_ids = params[:q].try(:[], :stop_area_ids).try(:select, &:present?)      @filters_stop_areas = Chouette::StopArea.find(stop_area_ids) if stop_area_ids.present? && stop_area_ids.size <= 2    end | 
