diff options
| author | Thomas Haddad | 2017-03-06 10:46:52 +0100 |
|---|---|---|
| committer | Thomas Haddad | 2017-03-06 10:46:52 +0100 |
| commit | e9554edf1a988e9e0a6928742ddbbe914002e8cb (patch) | |
| tree | c9481d75372d097b98435c3a2ff81cbf6168b8b7 /app/assets/javascripts | |
| parent | f7e8bc48ae6f582972222d12509a9e5a80e500b0 (diff) | |
| download | chouette-core-e9554edf1a988e9e0a6928742ddbbe914002e8cb.tar.bz2 | |
Refs #2521: Fix deletable/selected correlation when reduced
Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js index 752d14992..dafd2c2de 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js @@ -18,6 +18,7 @@ class VehicleJourney extends Component { <input onChange = {(e) => this.props.onSelectVehicleJourney(this.props.index)} type = 'checkbox' + disabled = {this.props.value.deletable} checked = {this.props.value.selected} ></input> </p> diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js index 70b8d5479..341506b82 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/reducers/vehicleJourneys.js @@ -161,7 +161,7 @@ const vehicleJourneys = (state = [], action) => { case 'DELETE_VEHICLEJOURNEYS': return state.map((vj, i) =>{ if (vj.selected){ - return Object.assign({}, vj, {deletable: true}) + return Object.assign({}, vj, {deletable: true, selected: false}) } else { return vj } |
