Merge branch 'master' of github.com:af83/stif-boiv

2 files changed, 2 insertions, 0 deletions

diff --git a/app/javascript/vehicle_journeys/components/VehicleJourney.js b/app/javascript/vehicle_journeys/components/VehicleJourney.js
index 5f6281487..7ac2a7ce7 100644
--- a/app/javascript/vehicle_journeys/components/VehicleJourney.js
+++ b/app/javascript/vehicle_journeys/components/VehicleJourney.js
@@ -69,6 +69,7 @@ export default class VehicleJourney extends Component {
           >
           <div className='strong mb-xs'>{this.props.value.short_id || '-'}</div>
           <div>{this.props.value.published_journey_name && this.props.value.published_journey_name != "non renseigné" ? this.props.value.published_journey_name : '-'}</div>
+          <div>{this.props.value.company ? this.props.value.company.name : '-'}</div>
           <div>{this.props.value.journey_pattern.short_id || '-'}</div>
           <div>
             {time_tables.slice(0,3).map((tt, i)=>
diff --git a/app/javascript/vehicle_journeys/components/VehicleJourneys.js b/app/javascript/vehicle_journeys/components/VehicleJourneys.js
index dc480d6b4..0cac0344c 100644
--- a/app/javascript/vehicle_journeys/components/VehicleJourneys.js
+++ b/app/javascript/vehicle_journeys/components/VehicleJourneys.js
@@ -117,6 +117,7 @@ export default class VehicleJourneys extends Component {
                   <div className='strong mb-xs'>ID course</div>
                   <div>Nom course</div>
                   <div>ID mission</div>
+                  <div>Transporteur</div>
                   <div>Calendriers</div>
                   { this.hasFeature('purchase_windows') && <div>Calendriers Commerciaux</div> }
                 </div>