aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Haddad2017-03-03 10:15:39 +0100
committerThomas Haddad2017-03-03 10:15:39 +0100
commitc25553756c018b8ce827e11dfaf613744b3659d8 (patch)
tree6df758f61f67ad917da5e6111c1248dddbbb0289
parent9555d04f9ee2c015808dbae62f179f177e34e038 (diff)
downloadchouette-core-c25553756c018b8ce827e11dfaf613744b3659d8.tar.bz2
Fix Select2s gardening for filters usage later
Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>
-rw-r--r--app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js2
-rw-r--r--app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js4
-rw-r--r--app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/MissionSelect2.js2
-rw-r--r--app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/AddVehicleJourney.js2
-rw-r--r--app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/CalendarsEditVehicleJourney.js2
5 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
index f90d8e48f..74d2903e0 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
@@ -62,7 +62,7 @@ const actions = {
type : 'EDIT_CALENDARS_VEHICLEJOURNEY_MODAL',
vehicleJourneys
}),
- select2Timetable: (selectedTT) =>({
+ selectTTCalendarsModal: (selectedTT) =>({
type: 'SEELCT_TT_CALENDAR_MODAL',
selectedItem:{
id: selectedTT.id
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js
index 6e589f1bb..e5d3d3b65 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js
@@ -59,7 +59,7 @@ class CreateModal extends Component {
<div className='col-lg-6 col-md-6 col-sm-6 col-xs-6'>
<div className='form-group'>
<label className='control-label is-required'>ID de la mission</label>
- <MissionSelect2 onSelectJPModal={this.props.onSelectJPModal} />
+ <MissionSelect2 onSelect2JourneyPattern={this.props.onSelect2JourneyPattern} />
</div>
</div>
</div>
@@ -101,7 +101,7 @@ CreateModal.propTypes = {
onOpenCreateModal: PropTypes.func.isRequired,
onModalClose: PropTypes.func.isRequired,
onAddVehicleJourney: PropTypes.func.isRequired,
- onSelectJPModal: PropTypes.func.isRequired
+ onSelect2JourneyPattern: PropTypes.func.isRequired
}
module.exports = CreateModal
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/MissionSelect2.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/MissionSelect2.js
index 0ab4475ac..c89aaf091 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/MissionSelect2.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/MissionSelect2.js
@@ -16,7 +16,7 @@ class BSelect4 extends React.Component{
return (
<Select2
defaultValue=''
- onSelect={(e) => this.props.onSelectJPModal(e) }
+ onSelect={(e) => this.props.onSelect2JourneyPattern(e) }
ref='journey_pattern_id'
options={{
placeholder: 'Nom d\'une mission existante',
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/AddVehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/AddVehicleJourney.js
index c4c746b81..1c8cf1063 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/AddVehicleJourney.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/AddVehicleJourney.js
@@ -22,7 +22,7 @@ const mapDispatchToProps = (dispatch) => {
onOpenCreateModal: () =>{
dispatch(actions.openCreateModal())
},
- onSelectJPModal: (e) =>{
+ onSelect2JourneyPattern: (e) =>{
dispatch(actions.selectJPCreateModal(e.params.data))
}
}
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/CalendarsEditVehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/CalendarsEditVehicleJourney.js
index 8491e6e32..1e58ed5fd 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/CalendarsEditVehicleJourney.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/CalendarsEditVehicleJourney.js
@@ -27,7 +27,7 @@ const mapDispatchToProps = (dispatch) => {
},
onSelect2Timetable: (e) =>{
console.log(e.params.data)
- dispatch(actions.select2Timetable(e.params.data))
+ dispatch(actions.selectTTCalendarsModal(e.params.data))
}
}
}