aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/controllers/referentials_controller.rb2
-rw-r--r--app/javascript/vehicle_journeys/components/VehicleJourney.js1
-rw-r--r--app/javascript/vehicle_journeys/components/VehicleJourneys.js1
-rw-r--r--app/models/referential.rb2
4 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/referentials_controller.rb b/app/controllers/referentials_controller.rb
index 83e3bc56a..436d5ccb5 100644
--- a/app/controllers/referentials_controller.rb
+++ b/app/controllers/referentials_controller.rb
@@ -66,7 +66,7 @@ class ReferentialsController < ChouetteController
def validate
ComplianceControlSetCopyWorker.perform_async(params[:compliance_control_set], params[:id])
flash[:notice] = t('notice.referentials.validate')
- redirect_to(referential_path)
+ redirect_to workbench_compliance_check_sets_path(referential.workbench_id)
end
def destroy
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>
diff --git a/app/models/referential.rb b/app/models/referential.rb
index 8391a8b00..1608550fb 100644
--- a/app/models/referential.rb
+++ b/app/models/referential.rb
@@ -155,6 +155,8 @@ class Referential < ActiveRecord::Base
def stop_points
Chouette::StopPoint.all
+ def compliance_check_sets
+ ComplianceCheckSet.all
end
before_validation :define_default_attributes