Refs #6196; Add Custom Fields to companies

2 files changed, 16 insertions, 9 deletions

diff --git a/app/controllers/companies_controller.rb b/app/controllers/companies_controller.rb
index 4afd12be1..a09cab783 100644
--- a/app/controllers/companies_controller.rb
+++ b/app/controllers/companies_controller.rb
@@ -38,12 +38,14 @@ class CompaniesController < ChouetteController
 
   protected
   def collection
-    @q = line_referential.companies.search(params[:q])
-
+    scope = line_referential.companies
+    @q = scope.search(params[:q])
+    ids = @q.result(:distinct => true).pluck(:id)
+    scope = scope.where(id: ids)
     if sort_column && sort_direction
-      @companies ||= @q.result(:distinct => true).order(sort_column + ' ' + sort_direction).paginate(:page => params[:page])
+      @companies ||= scope.order(sort_column + ' ' + sort_direction).paginate(:page => params[:page])
     else
-      @companies ||= @q.result(:distinct => true).order(:name).paginate(:page => params[:page])
+      @companies ||= scope.order(:name).paginate(:page => params[:page])
     end
   end
 
@@ -69,7 +71,9 @@ class CompaniesController < ChouetteController
   end
 
   def company_params
-    params.require(:company).permit( :objectid, :object_version, :name, :short_name, :organizational_unit, :operating_department_name, :code, :phone, :fax, :email, :registration_number, :url, :time_zone )
+    fields = [:objectid, :object_version, :name, :short_name, :organizational_unit, :operating_department_name, :code, :phone, :fax, :email, :registration_number, :url, :time_zone]
+    fields += permitted_custom_fields_params(Chouette::Company.custom_fields(line_referential.workgroup))
+    params.require(:company).permit( fields )
   end
 
   private
diff --git a/app/controllers/referential_companies_controller.rb b/app/controllers/referential_companies_controller.rb
index 806a70c8f..200e56a89 100644
--- a/app/controllers/referential_companies_controller.rb
+++ b/app/controllers/referential_companies_controller.rb
@@ -40,11 +40,12 @@ class ReferentialCompaniesController < ChouetteController
     end
 
     @q = scope.search(params[:q])
-
+    ids = @q.result(:distinct => true).pluck(:id)
+    scope = scope.where(id: ids)
     if sort_column && sort_direction
-      @companies ||= @q.result(:distinct => true).order(sort_column + ' ' + sort_direction).paginate(:page => params[:page])
+      @companies ||= scope.order(sort_column + ' ' + sort_direction).paginate(:page => params[:page])
     else
-      @companies ||= @q.result(:distinct => true).order(:name).paginate(:page => params[:page])
+      @companies ||= scope.order(:name).paginate(:page => params[:page])
     end
   end
 
@@ -57,7 +58,9 @@ class ReferentialCompaniesController < ChouetteController
   end
 
   def company_params
-    params.require(:company).permit( :objectid, :object_version, :name, :short_name, :organizational_unit, :operating_department_name, :code, :phone, :fax, :email, :registration_number, :url, :time_zone )
+    fields = [:objectid, :object_version, :name, :short_name, :organizational_unit, :operating_department_name, :code, :phone, :fax, :email, :registration_number, :url, :time_zone]
+    fields += permitted_custom_fields_params(Chouette::Company.custom_fields(@referential.workgroup))
+    params.require(:company).permit( fields )
   end
 
   private