diff options
| author | Zog | 2018-02-23 12:31:14 +0100 |
|---|---|---|
| committer | Zog | 2018-02-23 12:31:14 +0100 |
| commit | 0091a163232e901b105c930853731a8d294954fb (patch) | |
| tree | 5c044b277e16d0a5c0f185b04f00310448bad8dc /app | |
| parent | 7e3065d47441f3e4fc41678a80737eef12c50c84 (diff) | |
| download | chouette-core-0091a163232e901b105c930853731a8d294954fb.tar.bz2 | |
Refs #5982; Show error in VJ creation modal when no JP is selected
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/components/_modals.sass | 6 | ||||
| -rw-r--r-- | app/javascript/vehicle_journeys/actions/index.js | 3 | ||||
| -rw-r--r-- | app/javascript/vehicle_journeys/components/tools/CreateModal.js | 8 |
3 files changed, 14 insertions, 3 deletions
diff --git a/app/assets/stylesheets/components/_modals.sass b/app/assets/stylesheets/components/_modals.sass index e52a2e125..14b783c51 100644 --- a/app/assets/stylesheets/components/_modals.sass +++ b/app/assets/stylesheets/components/_modals.sass @@ -50,3 +50,9 @@ $modalW: 600px .modal-footer border-color: rgba($blue, 0.25) padding: 15px 30px + + .has-error .form-group + margin-bottom: -10px + + .form-group + margin-bottom: 25px diff --git a/app/javascript/vehicle_journeys/actions/index.js b/app/javascript/vehicle_journeys/actions/index.js index e67753e4b..5fb88f024 100644 --- a/app/javascript/vehicle_journeys/actions/index.js +++ b/app/javascript/vehicle_journeys/actions/index.js @@ -203,11 +203,10 @@ const actions = { let field = fields[key] if(field.validity && !field.validity.valid){ valid = false - $(field).parent().addClass('has-error').children('.help-block').remove() + $(field).parent().parent().addClass('has-error').children('.help-block').remove() $(field).parent().append("<span class='small help-block'>" + field.validationMessage + "</span>") } }) - return valid }, toggleArrivals : () => ({ diff --git a/app/javascript/vehicle_journeys/components/tools/CreateModal.js b/app/javascript/vehicle_journeys/components/tools/CreateModal.js index 24d9a23c2..a60429765 100644 --- a/app/javascript/vehicle_journeys/components/tools/CreateModal.js +++ b/app/javascript/vehicle_journeys/components/tools/CreateModal.js @@ -12,7 +12,13 @@ export default class CreateModal extends Component { } handleSubmit() { - if (actions.validateFields(...this.refs, $('.vjCreateSelectJP')[0]) && this.props.modal.modalProps.selectedJPModal) { + if(!this.props.modal.modalProps.selectedJPModal){ + let field = $('#NewVehicleJourneyModal').find(".vjCreateSelectJP") + field.parent().parent().addClass('has-error').children('.help-block').remove() + field.parent().append("<span class='small help-block'>" + I18n.t("simple_form.required.text") + "</span>") + return + } + if (actions.validateFields(...this.refs, $('.vjCreateSelectJP')[0])) { this.props.onAddVehicleJourney(_.assign({}, this.refs, {custom_fields: this.custom_fields}), this.props.modal.modalProps.selectedJPModal, this.props.stopPointsList, this.props.modal.modalProps.vehicleJourney && this.props.modal.modalProps.vehicleJourney.company) this.props.onModalClose() $('#NewVehicleJourneyModal').modal('hide') |