Merge pull request #526 from af83/6779-fix-info-button-on-vjs-editor

Fix disabled buttons in archived referentials. Fixes #6779 

4 files changed, 24 insertions, 6 deletions

diff --git a/app/javascript/vehicle_journeys/components/Tools.js b/app/javascript/vehicle_journeys/components/Tools.js
index efae6b2b5..41a521d12 100644
--- a/app/javascript/vehicle_journeys/components/Tools.js
+++ b/app/javascript/vehicle_journeys/components/Tools.js
@@ -36,13 +36,13 @@ export default class Tools extends Component {
           <AddVehicleJourney disabled={!this.hasPolicy("create") || !editMode} />
           <DuplicateVehicleJourney disabled={!this.hasPolicy("create") || !this.hasPolicy("update") || !editMode}/>
           <ShiftVehicleJourney disabled={!this.hasPolicy("update") || !editMode}/>
-          <EditVehicleJourney disabled={!this.hasPolicy("update")}/>
+          <EditVehicleJourney disabled={false}/>
 
-          <TimetablesEditVehicleJourney disabled={!this.hasPolicy("update")}/>
+          <TimetablesEditVehicleJourney disabled={false}/>
           { this.hasFeature('purchase_windows') &&
-            <PurchaseWindowsEditVehicleJourney disabled={!this.hasPolicy("update")}/>
+            <PurchaseWindowsEditVehicleJourney disabled={false}/>
           }
-          <ConstraintExclusionEditVehicleJourney disabled={!this.hasPolicy("update")}/>
+          <ConstraintExclusionEditVehicleJourney disabled={false}/>
           <NotesEditVehicleJourney disabled={!this.hasPolicy("update")}/>
           <DeleteVehicleJourneys disabled={!this.hasPolicy("destroy") || !editMode}/>
         </ul>
diff --git a/app/javascript/vehicle_journeys/components/VehicleJourney.js b/app/javascript/vehicle_journeys/components/VehicleJourney.js
index 5eb73de0e..f7ae9341f 100644
--- a/app/javascript/vehicle_journeys/components/VehicleJourney.js
+++ b/app/javascript/vehicle_journeys/components/VehicleJourney.js
@@ -111,7 +111,21 @@ export default class VehicleJourney extends Component {
           }
           >
           <div className='strong mb-xs'>{this.props.value.short_id || '-'}</div>
-          <div>{this.props.value.published_journey_name && this.props.value.published_journey_name != I18n.t('undefined') ? this.props.value.published_journey_name : '-'}</div>
+          <div>
+            <a href="#"
+              onClick={(e) => {
+                if(this.props.disabled){ return }
+                e.stopPropagation(true)
+                e.preventDefault()
+                this.props.onOpenInfoModal(this.props.value)
+                $('#EditVehicleJourneyModal').modal('show')
+                false
+                }
+              }
+            >
+              {this.props.value.published_journey_name && this.props.value.published_journey_name != I18n.t('undefined') ? this.props.value.published_journey_name : '-'}
+            </a>
+          </div>
           <div>{this.props.value.journey_pattern.short_id || '-'}</div>
           <div>{this.props.value.company ? this.props.value.company.name : '-'}</div>
           {
diff --git a/app/javascript/vehicle_journeys/components/VehicleJourneys.js b/app/javascript/vehicle_journeys/components/VehicleJourneys.js
index 27e147b37..0bb00e1ea 100644
--- a/app/javascript/vehicle_journeys/components/VehicleJourneys.js
+++ b/app/javascript/vehicle_journeys/components/VehicleJourneys.js
@@ -295,6 +295,7 @@ export default class VehicleJourneys extends Component {
                       features={this.props.features}
                       onUpdateTime={this.props.onUpdateTime}
                       onSelectVehicleJourney={this.props.onSelectVehicleJourney}
+                      onOpenInfoModal={this.props.onOpenInfoModal}
                       vehicleJourneys={this}
                       disabled={this.isReturn()}
                       allTimeTables={this.allTimeTables()}
diff --git a/app/javascript/vehicle_journeys/containers/VehicleJourneysList.js b/app/javascript/vehicle_journeys/containers/VehicleJourneysList.js
index f21e2c87e..45b061b66 100644
--- a/app/javascript/vehicle_journeys/containers/VehicleJourneysList.js
+++ b/app/javascript/vehicle_journeys/containers/VehicleJourneysList.js
@@ -27,7 +27,10 @@ const mapDispatchToProps = (dispatch) => {
     },
     onSelectVehicleJourney: (index) => {
       dispatch(actions.selectVehicleJourney(index))
-    }
+    },
+    onOpenInfoModal: (vj) =>{
+      dispatch(actions.openInfoModal(vj))
+    },
   }
 }