diff options
| author | Alban Peignier | 2017-12-27 21:58:51 +0100 |
|---|---|---|
| committer | GitHub | 2017-12-27 21:58:51 +0100 |
| commit | e045504dc8b3eb8d73d30eb04efb4116eabd8a4e (patch) | |
| tree | f4273d42aefe0513a12b84d90ccf2652c1120c3b | |
| parent | fdae84e447a09e8dac6b7f3167a35c209db342a6 (diff) | |
| parent | ee7610328bc3af35cadfe7c3fde6bf61ab8c9dbf (diff) | |
| download | chouette-core-e045504dc8b3eb8d73d30eb04efb4116eabd8a4e.tar.bz2 | |
Merge pull request #181 from af83/5137-timetable-color
Fix VJ tt color affectation. Refs #5408
| -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> ) } |