From a0567f40c0ad57abcf630d97816e38f73750138e Mon Sep 17 00:00:00 2001
From: Alban Peignier
Date: Wed, 25 Apr 2018 10:38:24 +0200
Subject: Workaround to CustomField initialization. #custom_fields_values
 requires to know the associated referential. Refs #6669

---
 app/controllers/companies_controller.rb  | 8 ++++++++
 app/controllers/stop_areas_controller.rb | 7 +++++++
 2 files changed, 15 insertions(+)

(limited to 'app/controllers')

diff --git a/app/controllers/companies_controller.rb b/app/controllers/companies_controller.rb
index a09cab783..bb83ffbd2 100644
--- a/app/controllers/companies_controller.rb
+++ b/app/controllers/companies_controller.rb
@@ -37,6 +37,14 @@ class CompaniesController < ChouetteController
 
 
   protected
+
+  # Workaround to CustomField initialization order. See #6669
+  def build_resource
+    @company ||= end_of_association_chain.build do |r|
+      r.attributes = resource_params.first
+    end
+  end
+
   def collection
     scope = line_referential.companies
     @q = scope.search(params[:q])
diff --git a/app/controllers/stop_areas_controller.rb b/app/controllers/stop_areas_controller.rb
index 734152c64..07d4afb7d 100644
--- a/app/controllers/stop_areas_controller.rb
+++ b/app/controllers/stop_areas_controller.rb
@@ -157,6 +157,13 @@ class StopAreasController < ChouetteController
 
   private
 
+  # Workaround to CustomField initialization order. See #6669
+  def build_resource
+    @stop_area ||= end_of_association_chain.build do |r|
+      r.attributes = resource_params.first
+    end
+  end
+
   def sort_column
     if parent.present?
       parent.stop_areas.column_names.include?(params[:sort]) ? params[:sort] : 'name'
-- 
cgit v1.2.3