diff options
| author | Zog | 2018-04-25 11:23:16 +0200 |
|---|---|---|
| committer | Zog | 2018-04-25 11:23:16 +0200 |
| commit | f6a84af5db6317537d67b6e9f14ed83f6882ebf0 (patch) | |
| tree | 4ffe236773ae78cd1910ea6b679cdee554bdb8b2 | |
| parent | 61d3ca8b94a02ffe5220156cd77e04a34aea7e63 (diff) | |
| download | chouette-core-f6a84af5db6317537d67b6e9f14ed83f6882ebf0.tar.bz2 | |
Refs #6669; Revert Workaround6669-fix-custom-fields-initialization
| -rw-r--r-- | app/controllers/companies_controller.rb | 7 | ||||
| -rw-r--r-- | app/controllers/stop_areas_controller.rb | 7 |
2 files changed, 0 insertions, 14 deletions
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' |