aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZog2018-04-26 15:20:02 +0200
committerZog2018-04-26 15:20:02 +0200
commitd6c119ecadb1c3e50e227b8ebbfb61405b1fbf72 (patch)
tree3ec31486f3cf8c7b048bd56de9020602118fcdab
parente69dfa80737402286adbfe6f29edae2efca36fd8 (diff)
downloadchouette-core-d6c119ecadb1c3e50e227b8ebbfb61405b1fbf72.tar.bz2
Refs #6829; Fix Purchase Windows assignment in VJs editor6829-fix-vjs-editor
-rw-r--r--app/javascript/vehicle_journeys/reducers/modal.js3
-rw-r--r--config/locales/vehicle_journeys.fr.yml2
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."