diff options
3 files changed, 6 insertions, 9 deletions
diff --git a/app/javascript/vehicle_journeys/components/tools/CustomFieldsInputs.js b/app/javascript/vehicle_journeys/components/tools/CustomFieldsInputs.js index eb8eb7080..90d72a801 100644 --- a/app/javascript/vehicle_journeys/components/tools/CustomFieldsInputs.js +++ b/app/javascript/vehicle_journeys/components/tools/CustomFieldsInputs.js @@ -16,7 +16,7 @@ export default class CustomFieldsInputs extends Component { })} ref={'custom_fields.' + cf.code} className='form-control' - value={cf.value} + defaultValue={cf.value} disabled={this.props.disabled} options={{ theme: 'bootstrap', diff --git a/app/javascript/vehicle_journeys/components/tools/EditVehicleJourney.js b/app/javascript/vehicle_journeys/components/tools/EditVehicleJourney.js index 1ac161485..2893422f8 100644 --- a/app/javascript/vehicle_journeys/components/tools/EditVehicleJourney.js +++ b/app/javascript/vehicle_journeys/components/tools/EditVehicleJourney.js @@ -7,7 +7,6 @@ import CustomFieldsInputs from './CustomFieldsInputs' export default class EditVehicleJourney extends Component { constructor(props) { super(props) - this.custom_fields = {} } handleSubmit() { @@ -29,6 +28,9 @@ export default class EditVehicleJourney extends Component { return false } if(this.props.status.fetchSuccess == true) { + if(this.props.modal.modalProps.vehicleJourney){ + this.custom_fields = _.assign({}, this.props.modal.modalProps.vehicleJourney.custom_fields) + } return ( <li className='st_action'> <button @@ -145,7 +147,7 @@ export default class EditVehicleJourney extends Component { <div className='row'> <CustomFieldsInputs values={this.props.modal.modalProps.vehicleJourney.custom_fields} - onUpdate={(code, value) => this.custom_fields[code] = value} + onUpdate={(code, value) => this.custom_fields[code]["value"] = value} disabled={!this.props.editMode} /> </div> diff --git a/app/javascript/vehicle_journeys/reducers/vehicleJourneys.js b/app/javascript/vehicle_journeys/reducers/vehicleJourneys.js index 8d68ad2db..62b846d9a 100644 --- a/app/javascript/vehicle_journeys/reducers/vehicleJourneys.js +++ b/app/javascript/vehicle_journeys/reducers/vehicleJourneys.js @@ -146,16 +146,11 @@ export default function vehicleJourneys(state = [], action) { case 'EDIT_VEHICLEJOURNEY': return state.map((vj, i) => { if (vj.selected){ - let custom_fields = _.assign({}, action.data.custom_fields) - _.each(custom_fields, (cf, code) => { - let value = action.data.custom_fields[code] - custom_fields[code] = _.assign({}, custom_fields[code], {value}) - }) return _.assign({}, vj, { company: action.selectedCompany, published_journey_name: action.data.published_journey_name.value, published_journey_identifier: action.data.published_journey_identifier.value, - custom_fields: custom_fields, + custom_fields: action.data.custom_fields, }) }else{ return vj |