From 913dd3b3c6cfa0b519ac3043e8b0a4efc4d983b9 Mon Sep 17 00:00:00 2001
From: Zog
Date: Wed, 25 Apr 2018 11:23:16 +0200
Subject: Refs #6669; Revert Workaround

---
 app/controllers/companies_controller.rb  | 7 -------
 app/controllers/stop_areas_controller.rb | 7 -------
 2 files changed, 14 deletions(-)

(limited to 'app/controllers')

diff --git a/app/controllers/companies_controller.rb b/app/controllers/companies_controller.rb
index bb83ffbd2..2c32ed3a5 100644
--- a/app/controllers/companies_controller.rb
+++ b/app/controllers/companies_controller.rb
@@ -38,13 +38,6 @@ 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 07d4afb7d..734152c64 100644
--- a/app/controllers/stop_areas_controller.rb
+++ b/app/controllers/stop_areas_controller.rb
@@ -157,13 +157,6 @@ 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