diff options
| author | Robert | 2017-05-31 15:01:40 +0200 |
|---|---|---|
| committer | Robert | 2017-05-31 15:01:40 +0200 |
| commit | 46638c5ca8001063f52973de521da77c8e4ff4cd (patch) | |
| tree | af5c47bd43a82b2e76779befdb93b00add9fdc2d /app/assets/javascripts | |
| parent | b561d04020be9015b2eea88e92c6eedc1f529d53 (diff) | |
| parent | 9a347995a88e6347ed7dbd8ade45ccd574f9b7b6 (diff) | |
| download | chouette-core-46638c5ca8001063f52973de521da77c8e4ff4cd.tar.bz2 | |
conflict resolved
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js index 9dea63e07..c7e8d58e7 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js @@ -42,7 +42,9 @@ const vehicleJourney= (state = {}, action, keep) => { time_tables: [], vehicle_journey_at_stops: pristineVjasList, selected: false, - deletable: false + deletable: false, + transport_mode: window.transportMode ? window.transportMode : 'undefined', + transport_submode: window.transportSubmode ? window.transportSubmode : 'undefined' } case 'DUPLICATE_VEHICLEJOURNEY': case 'SHIFT_VEHICLEJOURNEY': |