diff options
| author | Teddy Wing | 2017-05-12 17:41:03 +0200 |
|---|---|---|
| committer | Teddy Wing | 2017-05-12 17:56:27 +0200 |
| commit | 36ebc58343bc82c08672f019b1102c3f49e244fb (patch) | |
| tree | 910ffae9e43f0c77c112a394bab51bf61c145ba7 /app/assets/javascripts | |
| parent | b11e7d792b2c3743ca95f7a2d6d5c7bdc4a39105 (diff) | |
| download | chouette-core-36ebc58343bc82c08672f019b1102c3f49e244fb.tar.bz2 | |
VehicleJourneysController#collection: Restore departure time filter
Handle temporary fixes from 972500267f28f233d5670277c02d43fae5ad8e7b and
1f6fb9c73206f3984d2f942d5d16fb9c094b2164. Restore the JavaScript because
that should function the same way now.
Remove the Ransack call as we've moved this departure time filter
outside of Ransack and into our own custom method in order to eliminate
a duplicated "JOIN" call on "vehicle_journey_at_stops" collision between
the `.with_stops` query and Ransack. The new filter lives in
`VehicleJourney.where_departure_time_between`.
Refs #3370
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/filters.js | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/filters.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/filters.js index 80b62c6b4..cd065e362 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/filters.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/filters.js @@ -53,10 +53,9 @@ const filters = (state = {}, action) => { let params = { 'q[journey_pattern_id_eq]': state.query.journeyPattern.id || undefined, 'q[time_tables_id_eq]': state.query.timetable.id || undefined, - // Fixme 3358 - // 'q[vehicle_journey_at_stops_departure_time_gteq]': (state.query.interval.start.hour + ':' + state.query.interval.start.minute), - // 'q[vehicle_journey_at_stops_departure_time_lteq]': (state.query.interval.end.hour + ':' + state.query.interval.end.minute), - // 'q[vehicle_journey_without_departure_time]' : state.query.withoutSchedule + 'q[vehicle_journey_at_stops_departure_time_gteq]': (state.query.interval.start.hour + ':' + state.query.interval.start.minute), + 'q[vehicle_journey_at_stops_departure_time_lteq]': (state.query.interval.end.hour + ':' + state.query.interval.end.minute), + 'q[vehicle_journey_without_departure_time]' : state.query.withoutSchedule } let queryString = actions.encodeParams(params) return _.assign({}, state, {queryString: queryString}) |