diff options
| author | Zog | 2017-12-28 11:57:12 +0100 |
|---|---|---|
| committer | Zog | 2017-12-28 11:58:26 +0100 |
| commit | a5ac3d72be252e8001b5d823d6c050cf810094f3 (patch) | |
| tree | 38d44715162142853495205e460a1529b4dcc8cb /app/javascript | |
| parent | 09dcd818d83a1dddef4e4f2e3fd800fb228c51c0 (diff) | |
| download | chouette-core-a5ac3d72be252e8001b5d823d6c050cf810094f3.tar.bz2 | |
Refs #5435 @0.5h; Fix Company select in VehicleJourney edition modal
Diffstat (limited to 'app/javascript')
| -rw-r--r-- | app/javascript/vehicle_journeys/actions/index.js | 2 | ||||
| -rw-r--r-- | app/javascript/vehicle_journeys/reducers/modal.js | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/app/javascript/vehicle_journeys/actions/index.js b/app/javascript/vehicle_journeys/actions/index.js index 55938c10a..5a71a75a4 100644 --- a/app/javascript/vehicle_journeys/actions/index.js +++ b/app/javascript/vehicle_journeys/actions/index.js @@ -363,7 +363,7 @@ const actions = { selected: false, published_journey_name: val.published_journey_name || 'non renseigné', published_journey_identifier: val.published_journey_identifier || 'non renseigné', - company: val.company || 'non renseigné', + company: val.company || {name: 'non renseigné'}, transport_mode: val.route.line.transport_mode || 'undefined', transport_submode: val.route.line.transport_submode || 'undefined' }) diff --git a/app/javascript/vehicle_journeys/reducers/modal.js b/app/javascript/vehicle_journeys/reducers/modal.js index 862e27e1b..eae3314e8 100644 --- a/app/javascript/vehicle_journeys/reducers/modal.js +++ b/app/javascript/vehicle_journeys/reducers/modal.js @@ -1,6 +1,6 @@ import _ from 'lodash' -let vehicleJourneysModal, newModalProps +let vehicleJourneysModal, newModalProps, vehicleJourney export default function modal(state = {}, action) { switch (action.type) { @@ -74,10 +74,12 @@ export default function modal(state = {}, action) { confirmModal: {} } case 'SELECT_CP_EDIT_MODAL': - newModalProps = _.assign({}, state.modalProps, {selectedCompany : action.selectedItem}) + vehicleJourney = _.assign({}, state.modalProps.vehicleJourney, {company: action.selectedItem}) + newModalProps = _.assign({}, state.modalProps, {vehicleJourney}) return _.assign({}, state, {modalProps: newModalProps}) case 'UNSELECT_CP_EDIT_MODAL': - newModalProps = _.assign({}, state.modalProps, {selectedCompany : undefined}) + vehicleJourney = _.assign({}, state.modalProps.vehicleJourney, {company: undefined}) + newModalProps = _.assign({}, state.modalProps, {vehicleJourney}) return _.assign({}, state, {modalProps: newModalProps}) case 'SELECT_TT_CALENDAR_MODAL': newModalProps = _.assign({}, state.modalProps, {selectedTimetable : action.selectedItem}) |