diff options
| author | Alban Peignier | 2018-02-20 09:05:53 +0100 |
|---|---|---|
| committer | Alban Peignier | 2018-02-20 09:05:53 +0100 |
| commit | a01519fc871e22a220157cfa8c8d6d5b5c80f5cb (patch) | |
| tree | 0ebf10ee9ac8378468e379974a93b1c306a98873 /app | |
| parent | 07a0af65fb2b6e56c76f5aba7d1e0ef53c7cc21d (diff) | |
| download | chouette-core-a01519fc871e22a220157cfa8c8d6d5b5c80f5cb.tar.bz2 | |
Replace current_workgroup by referential.workgroup. Refs #5867
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/vehicle_journeys_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/referential.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb index 9dbb3bc43..14795227c 100644 --- a/app/controllers/vehicle_journeys_controller.rb +++ b/app/controllers/vehicle_journeys_controller.rb @@ -154,7 +154,7 @@ class VehicleJourneysController < ChouetteController private def load_custom_fields - @custom_fields = current_workgroup&.custom_fields_definitions || {} + @custom_fields = referential.workgroup&.custom_fields_definitions || {} end def map_stop_points points diff --git a/app/models/referential.rb b/app/models/referential.rb index 509e0412f..09c2e7d34 100644 --- a/app/models/referential.rb +++ b/app/models/referential.rb @@ -51,7 +51,9 @@ class Referential < ActiveRecord::Base belongs_to :stop_area_referential validates_presence_of :stop_area_referential has_many :stop_areas, through: :stop_area_referential + belongs_to :workbench + delegate :workgroup, to: :workbench, allow_nil: true belongs_to :referential_suite |