aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlban Peignier2018-04-26 17:18:22 +0200
committerGitHub2018-04-26 17:18:22 +0200
commit715917bf6503a06d7d7c130b8b007525dc52742e (patch)
treeb2125e59873001b7b038ade4ca5e4c2dc0ed6342
parent0d3c06b03ca9910782dd2717a91c935b7fe57fd4 (diff)
parent99af07f2a7c4267eceb60d220bb9dd804fb96511 (diff)
downloadchouette-core-715917bf6503a06d7d7c130b8b007525dc52742e.tar.bz2
Merge pull request #537 from af83/6836-fix-checksums
Fix checksum for new journeys. Refs #6836
-rw-r--r--app/javascript/vehicle_journeys/components/tools/CreateModal.js5
-rw-r--r--app/javascript/vehicle_journeys/components/tools/EditVehicleJourney.js2
2 files changed, 6 insertions, 1 deletions
diff --git a/app/javascript/vehicle_journeys/components/tools/CreateModal.js b/app/javascript/vehicle_journeys/components/tools/CreateModal.js
index 2806708f4..e13288f71 100644
--- a/app/javascript/vehicle_journeys/components/tools/CreateModal.js
+++ b/app/javascript/vehicle_journeys/components/tools/CreateModal.js
@@ -9,6 +9,11 @@ export default class CreateModal extends Component {
constructor(props) {
super(props)
this.custom_fields = _.assign({}, this.props.custom_fields)
+ _.map(this.custom_fields, (cf, k)=>{
+ if(cf.options && cf.options.default){
+ this.custom_fields[k]["value"] = cf.options.default
+ }
+ })
}
handleSubmit() {
diff --git a/app/javascript/vehicle_journeys/components/tools/EditVehicleJourney.js b/app/javascript/vehicle_journeys/components/tools/EditVehicleJourney.js
index 60d982845..229324ffb 100644
--- a/app/javascript/vehicle_journeys/components/tools/EditVehicleJourney.js
+++ b/app/javascript/vehicle_journeys/components/tools/EditVehicleJourney.js
@@ -152,7 +152,7 @@ export default class EditVehicleJourney extends Component {
ref='checksum'
className='form-control'
disabled='disabled'
- defaultValue={this.props.modal.modalProps.vehicleJourney.checksum}
+ value={this.props.modal.modalProps.vehicleJourney.checksum}
/>
</div>
<div className='row'>