From fe7e8eeb1d3cf2b5c0ff293c8d5705fa586bdd27 Mon Sep 17 00:00:00 2001 From: Zog Date: Wed, 25 Apr 2018 17:15:10 +0200 Subject: Refs #6779; Fix diabled buttons in archived referentials --- app/javascript/vehicle_journeys/components/Tools.js | 8 ++++---- .../vehicle_journeys/components/VehicleJourney.js | 16 +++++++++++++++- .../vehicle_journeys/components/VehicleJourneys.js | 1 + .../vehicle_journeys/containers/VehicleJourneysList.js | 5 ++++- 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 { - + - + { this.hasFeature('purchase_windows') && - + } - + 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 { } >
{this.props.value.short_id || '-'}
-
{this.props.value.published_journey_name && this.props.value.published_journey_name != I18n.t('undefined') ? this.props.value.published_journey_name : '-'}
+
{this.props.value.journey_pattern.short_id || '-'}
{this.props.value.company ? this.props.value.company.name : '-'}
{ 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)) + }, } } -- cgit v1.2.3