aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/vehicle_journeys_controller.rb
diff options
context:
space:
mode:
authorTeddy Wing2017-05-12 17:32:09 +0200
committerTeddy Wing2017-05-12 17:56:27 +0200
commitb11e7d792b2c3743ca95f7a2d6d5c7bdc4a39105 (patch)
treed987caa2f0034922e1a8a0ac5207492f93ee5273 /app/controllers/vehicle_journeys_controller.rb
parent7bf94bc6e6ce6558252252e68419e89a23213573 (diff)
downloadchouette-core-b11e7d792b2c3743ca95f7a2d6d5c7bdc4a39105.tar.bz2
VehicleJourneysController: When filtering departure_time allow nil stops
There's a `params[:q][:vehicle_journey_without_departure_time]` parameter coming in from the frontend that's supposed to allow it to decide whether or not to include vehicle journeys that have nil stops. Allow this parameter to function for the `VehicleJourney.where_departure_time_between` method by conditionally checking an input parameter to determine whether to add the "OR" condition onto the "WHERE" filter. Refs #3370
Diffstat (limited to 'app/controllers/vehicle_journeys_controller.rb')
-rw-r--r--app/controllers/vehicle_journeys_controller.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb
index c78613e99..eebcbb922 100644
--- a/app/controllers/vehicle_journeys_controller.rb
+++ b/app/controllers/vehicle_journeys_controller.rb
@@ -84,7 +84,9 @@ class VehicleJourneysController < ChouetteController
params[:q][:vehicle_journey_at_stops_departure_time_lteq]
scope = scope.where_departure_time_between(
params[:q][:vehicle_journey_at_stops_departure_time_gteq],
- params[:q][:vehicle_journey_at_stops_departure_time_lteq]
+ params[:q][:vehicle_journey_at_stops_departure_time_lteq],
+ allow_empty:
+ params[:q][:vehicle_journey_without_departure_time] == 'true'
)
end