diff options
| author | Zog | 2018-04-25 11:23:16 +0200 |
|---|---|---|
| committer | Johan Van Ryseghem | 2018-04-25 15:46:33 +0200 |
| commit | 913dd3b3c6cfa0b519ac3043e8b0a4efc4d983b9 (patch) | |
| tree | e6788645b6b2e50c508fed61ec55aada08c8b890 | |
| parent | 0f0be7d01a87c64f30539205379e4d7588f6d73e (diff) | |
| download | chouette-core-913dd3b3c6cfa0b519ac3043e8b0a4efc4d983b9.tar.bz2 | |
Refs #6669; Revert Workaround
| -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' |