diff options
| author | Thomas Haddad | 2017-04-06 15:28:14 +0200 |
|---|---|---|
| committer | Thomas Haddad | 2017-04-06 15:28:48 +0200 |
| commit | 45a789aa0041cbfeca535a8679f3d88ccbe01757 (patch) | |
| tree | 74b07cceeda836062b9f704ef1383e1f208f6b4f /app/assets/javascripts | |
| parent | 198cf9f3995df6149361c45ee1b2b1ea10288660 (diff) | |
| download | chouette-core-45a789aa0041cbfeca535a8679f3d88ccbe01757.tar.bz2 | |
Refs #2507: Fix filter modal not being displayed, added arg in querystring for toggle arrivals
Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/filters.js | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js index a37b9f1d8..d9f6d5550 100644 --- a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js +++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js @@ -14,7 +14,7 @@ class JourneyPattern extends Component{ let vjURL = routeURL + '/vehicle_journeys?jp=' + jpOid return ( - <a href={vjURL}>Horaires des courses</a> + <a data-no-turbolink="true" href={vjURL}>Horaires des courses</a> ) } 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 e7d5baafc..0fcb3489e 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/filters.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/filters.js @@ -54,7 +54,8 @@ const filters = (state = {}, action) => { '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_at_stops_departure_time_lteq]': (state.query.interval.end.hour + ':' + state.query.interval.end.minute), + 'q[vehicle_journey_without_u2]' : state.toggleArrivals } let queryString = actions.encodeParams(params) return _.assign({}, state, {queryString: queryString}) |