diff options
| author | cedricnjanga | 2017-12-26 12:36:13 +0100 |
|---|---|---|
| committer | cedricnjanga | 2017-12-26 12:36:13 +0100 |
| commit | ee7610328bc3af35cadfe7c3fde6bf61ab8c9dbf (patch) | |
| tree | cd5557b521d70b9d5c7f9ba8195af9f9b60dec1e | |
| parent | 938dae71ae29a0c2934a1027046d61dd5dcaf135 (diff) | |
| download | chouette-core-ee7610328bc3af35cadfe7c3fde6bf61ab8c9dbf.tar.bz2 | |
#5408 Fix VJ tt color affectation5137-timetable-color
| -rw-r--r-- | app/javascript/vehicle_journeys/actions/index.js | 3 | ||||
| -rw-r--r-- | app/javascript/vehicle_journeys/components/VehicleJourney.js | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/javascript/vehicle_journeys/actions/index.js b/app/javascript/vehicle_journeys/actions/index.js index ce4b9209d..adb93ddf1 100644 --- a/app/javascript/vehicle_journeys/actions/index.js +++ b/app/javascript/vehicle_journeys/actions/index.js @@ -84,7 +84,8 @@ const actions = { selectedItem:{ id: selectedTT.id, comment: selectedTT.comment, - objectid: selectedTT.objectid + objectid: selectedTT.objectid, + color: selectedTT.color } }), addSelectedTimetable: () => ({ diff --git a/app/javascript/vehicle_journeys/components/VehicleJourney.js b/app/javascript/vehicle_journeys/components/VehicleJourney.js index 929cbc5c4..5769a810a 100644 --- a/app/javascript/vehicle_journeys/components/VehicleJourney.js +++ b/app/javascript/vehicle_journeys/components/VehicleJourney.js @@ -22,7 +22,7 @@ export default class VehicleJourney extends Component { let ttURL = refURL + '/time_tables/' + tt.id return ( - <a href={ttURL} title='Voir le calendrier'><span className='fa fa-calendar' style={{color: (tt.color ? tt.color : '')}}></span></a> + <a href={ttURL} title='Voir le calendrier'><span className='fa fa-calendar' style={{ color: (tt.color ? tt.color : '#4B4B4B')}}></span></a> ) } |
