aboutsummaryrefslogtreecommitdiffstats
path: root/app/javascript/vehicle_journeys/containers
diff options
context:
space:
mode:
authorZog2018-02-01 10:34:40 +0100
committerZog2018-02-01 10:34:40 +0100
commitd114d549f7bc8a772803175dee9a665266d8ed04 (patch)
tree228fa0008b6938d4d7682896df1d9578abdce872 /app/javascript/vehicle_journeys/containers
parent90f54f0acfe65ff276a229239809ce0e9fddf0b0 (diff)
downloadchouette-core-d114d549f7bc8a772803175dee9a665266d8ed04.tar.bz2
Refs #5798 @3h; Show return journeys on the journeys' editor.
Diffstat (limited to 'app/javascript/vehicle_journeys/containers')
-rw-r--r--app/javascript/vehicle_journeys/containers/VehicleJourneysList.js8
-rw-r--r--app/javascript/vehicle_journeys/containers/tools/EditVehicleJourney.js1
2 files changed, 6 insertions, 3 deletions
diff --git a/app/javascript/vehicle_journeys/containers/VehicleJourneysList.js b/app/javascript/vehicle_journeys/containers/VehicleJourneysList.js
index 38ab9f6d3..76d1c3a78 100644
--- a/app/javascript/vehicle_journeys/containers/VehicleJourneysList.js
+++ b/app/javascript/vehicle_journeys/containers/VehicleJourneysList.js
@@ -6,17 +6,19 @@ const mapStateToProps = (state) => {
return {
editMode: state.editMode,
vehicleJourneys: state.vehicleJourneys,
+ returnVehicleJourneys: state.returnVehicleJourneys,
status: state.status,
filters: state.filters,
- stopPointsList: state.stopPointsList
+ stopPointsList: state.stopPointsList,
+ returnStopPointsList: state.returnStopPointsList
}
}
const mapDispatchToProps = (dispatch) => {
return {
- onLoadFirstPage: (filters) =>{
+ onLoadFirstPage: (filters, routeUrl) =>{
dispatch(actions.fetchingApi())
- actions.fetchVehicleJourneys(dispatch, undefined, undefined, filters.queryString)
+ actions.fetchVehicleJourneys(dispatch, undefined, undefined, filters.queryString, routeUrl)
},
onUpdateTime: (e, subIndex, index, timeUnit, isDeparture, isArrivalsToggled) => {
dispatch(actions.updateTime(e.target.value, subIndex, index, timeUnit, isDeparture, isArrivalsToggled))
diff --git a/app/javascript/vehicle_journeys/containers/tools/EditVehicleJourney.js b/app/javascript/vehicle_journeys/containers/tools/EditVehicleJourney.js
index c2eabcc10..a851b6e7d 100644
--- a/app/javascript/vehicle_journeys/containers/tools/EditVehicleJourney.js
+++ b/app/javascript/vehicle_journeys/containers/tools/EditVehicleJourney.js
@@ -18,6 +18,7 @@ const mapDispatchToProps = (dispatch) => {
dispatch(actions.closeModal())
},
onOpenEditModal: (vj) =>{
+ console.log({vj})
dispatch(actions.openEditModal(vj))
},
onEditVehicleJourney: (data, selectedCompany) =>{