Refs #3200: fix company save on editmodal for VJ

1 files changed, 7 insertions, 1 deletions

diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/EditVehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/EditVehicleJourney.js
index af9e293f7..a0ef19ecd 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/EditVehicleJourney.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/EditVehicleJourney.js
@@ -11,7 +11,13 @@ class EditVehicleJourney extends Component {
 
   handleSubmit() {
     if(actions.validateFields(this.refs) == true) {
-      this.props.onEditVehicleJourney(this.refs, this.props.modal.modalProps.selectedCompany)
+      var company;
+      if(this.props.modal.modalProps.selectedCompany) {
+        company = this.props.modal.modalProps.selectedCompany
+      } else {
+        company = this.props.modal.modalProps.vehicleJourney.company
+      }
+      this.props.onEditVehicleJourney(this.refs, company)
       this.props.onModalClose()
       $('#EditVehicleJourneyModal').modal('hide')
     }