diff options
| author | Alban Peignier | 2018-04-26 16:06:43 +0200 |
|---|---|---|
| committer | GitHub | 2018-04-26 16:06:43 +0200 |
| commit | 1b5e9c96980b9962cec13ac9fba38830345ebfec (patch) | |
| tree | 9d5041ddc0806382654f6881d2231f4fc36c2440 | |
| parent | 2260fac9c30d23aadbf9d13c078ef5562c2e505e (diff) | |
| parent | d6c119ecadb1c3e50e227b8ebbfb61405b1fbf72 (diff) | |
| download | chouette-core-1b5e9c96980b9962cec13ac9fba38830345ebfec.tar.bz2 | |
Merge pull request #535 from af83/6829-fix-vjs-editor
Fix Purchase Windows assignment in VJs editor. Fixes #6829
| -rw-r--r-- | app/javascript/vehicle_journeys/reducers/modal.js | 3 | ||||
| -rw-r--r-- | config/locales/vehicle_journeys.fr.yml | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/javascript/vehicle_journeys/reducers/modal.js b/app/javascript/vehicle_journeys/reducers/modal.js index 75ab2f4ca..077e2f0d4 100644 --- a/app/javascript/vehicle_journeys/reducers/modal.js +++ b/app/javascript/vehicle_journeys/reducers/modal.js @@ -117,6 +117,9 @@ export default function modal(state = {}, action) { case 'SELECT_TT_CALENDAR_MODAL': newModalProps = _.assign({}, state.modalProps, {selectedTimetable : action.selectedItem}) return _.assign({}, state, {modalProps: newModalProps}) + case 'SELECT_PURCHASE_WINDOW_MODAL': + newModalProps = _.assign({}, state.modalProps, {selectedPurchaseWindow : action.selectedItem}) + return _.assign({}, state, {modalProps: newModalProps}) case 'SELECT_CONSTRAINT_ZONE_MODAL': let selectedConstraintZones = state.modalProps.selectedConstraintZones let already_present = false diff --git a/config/locales/vehicle_journeys.fr.yml b/config/locales/vehicle_journeys.fr.yml index e9d97c8cc..c47de888f 100644 --- a/config/locales/vehicle_journeys.fr.yml +++ b/config/locales/vehicle_journeys.fr.yml @@ -5,7 +5,7 @@ fr: id: Filtrer par ID course... journey_pattern: 'Filtrer par code, nom ou OID de mission...' timetable: Filtrer par calendrier... - purchase_windows: Filtrer par calendrier commercial... + purchase_window: Filtrer par calendrier commercial... constraint_zone: Choisir une ITL cancel_selection: "Annuler la sélection" fetching_error: "La récupération des missions a rencontré un problème. Rechargez la page pour tenter de corriger le problème." |