diff options
| author | Xinhui | 2017-05-12 11:48:55 +0200 |
|---|---|---|
| committer | Xinhui | 2017-05-12 11:49:00 +0200 |
| commit | 972500267f28f233d5670277c02d43fae5ad8e7b (patch) | |
| tree | 5dd7ead9707d9c2c006e766339aee25cf53e934a | |
| parent | c165b56f3cebe8e500434ca86c647955ba944b61 (diff) | |
| download | chouette-core-972500267f28f233d5670277c02d43fae5ad8e7b.tar.bz2 | |
VehicleJourneys#index Temp disable filter by departure time
Refs #3358
| -rw-r--r-- | app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/filters.js | 7 | ||||
| -rw-r--r-- | app/controllers/vehicle_journeys_controller.rb | 3 |
2 files changed, 5 insertions, 5 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 cd065e362..80b62c6b4 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/filters.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/filters.js @@ -53,9 +53,10 @@ 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, - '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 + // 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 } let queryString = actions.encodeParams(params) return _.assign({}, state, {queryString: queryString}) diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb index a44a03886..cca75af5b 100644 --- a/app/controllers/vehicle_journeys_controller.rb +++ b/app/controllers/vehicle_journeys_controller.rb @@ -78,7 +78,6 @@ class VehicleJourneysController < ChouetteController protected def collection scope = route.vehicle_journeys.with_stops - @q = scope.search filtered_ransack_params # Fixme 3358 @@ -94,7 +93,6 @@ class VehicleJourneysController < ChouetteController def ransack_periode_filter if params[:q] && params[:q][:vehicle_journey_at_stops_departure_time_gteq] - params[:q] = params[:q].reject{|k| params[:q][k] == 'undefined'} between = [:departure_time_gteq, :departure_time_lteq].map do |filter| "2000-01-01 #{params[:q]["vehicle_journey_at_stops_#{filter}"]}:00 UTC" end @@ -108,6 +106,7 @@ class VehicleJourneysController < ChouetteController def filtered_ransack_params if params[:q] + params[:q] = params[:q].reject{|k| params[:q][k] == 'undefined'} params[:q].except(:vehicle_journey_at_stops_departure_time_gteq, :vehicle_journey_at_stops_departure_time_lteq) end end |