From ee7610328bc3af35cadfe7c3fde6bf61ab8c9dbf Mon Sep 17 00:00:00 2001
From: cedricnjanga
Date: Tue, 26 Dec 2017 12:36:13 +0100
Subject: #5408 Fix VJ tt color affectation

---
 app/javascript/vehicle_journeys/actions/index.js             | 3 ++-
 app/javascript/vehicle_journeys/components/VehicleJourney.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'app/javascript')

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>
     )
   }
 
-- 
cgit v1.2.3