Override collection_name and instance_name in ReferentialCompaniesController. Define company.line_referential for build resource. Refs #905

3 files changed, 17 insertions, 6 deletions

diff --git a/app/controllers/referential_companies_controller.rb b/app/controllers/referential_companies_controller.rb
index 477c3da9c..104deba9f 100644
--- a/app/controllers/referential_companies_controller.rb
+++ b/app/controllers/referential_companies_controller.rb
@@ -1,5 +1,5 @@
 class ReferentialCompaniesController < ChouetteController
-  defaults :resource_class => Chouette::Company
+  defaults :resource_class => Chouette::Company, :collection_name => 'companies', :instance_name => 'company'
   respond_to :html
   respond_to :xml
   respond_to :json
@@ -19,6 +19,13 @@ class ReferentialCompaniesController < ChouetteController
   end
 
   protected
+
+  def build_resource
+    super.tap do |company|
+      company.line_referential = referential.line_referential
+    end
+  end
+
   def collection
     @q = referential.companies.search(params[:q])
     @companies ||= @q.result(:distinct => true).order(:name).paginate(:page => params[:page])
@@ -35,4 +42,4 @@ class ReferentialCompaniesController < ChouetteController
   def company_params
     params.require(:company).permit( :objectid, :object_version, :creation_time, :creator_id, :name, :short_name, :organizational_unit, :operating_department_name, :code, :phone, :fax, :email, :registration_number, :url, :time_zone )
   end
-end
\ No newline at end of file
+end
diff --git a/config/locales/companies.en.yml b/config/locales/companies.en.yml
index 760ef91e4..7393a2af7 100644
--- a/config/locales/companies.en.yml
+++ b/config/locales/companies.en.yml
@@ -1,12 +1,12 @@
 en:
-  companies:
+  companies: &en_companies
     actions:
       new: "Add a new company"
       edit: "Edit this company"
       destroy: "Remove this company"
       destroy_confirm: "Are you sure you want destroy this company?"
     new:
-      title: "Add a new company"        
+      title: "Add a new company"
     edit:
       title: "Update company  %{company}"
     show:
@@ -62,5 +62,7 @@ en:
       hub:
         company:
           name: "maximum 75 characters"
-          registration_number: "Positif integer, unique key, of no more than 8 digits." 
+          registration_number: "Positif integer, unique key, of no more than 8 digits."
           objectid: "[prefix]:Company:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character. Maximum length of the unique key = 3."
+  referential_companies:
+    <<: *en_companies
\ No newline at end of file
diff --git a/config/locales/companies.fr.yml b/config/locales/companies.fr.yml
index b3b437220..909ee1045 100644
--- a/config/locales/companies.fr.yml
+++ b/config/locales/companies.fr.yml
@@ -1,5 +1,5 @@
 fr:
-  companies:
+  companies: &fr_companies
     actions:
       new: "Ajouter un transporteur"
       edit: "Modifier ce transporteur"
@@ -64,3 +64,5 @@ fr:
           name: "maximum 75 caractères"
           registration_number: "Entier positif, clé unique, d'un maximum de 8 chiffres."
           objectid: "[prefixe]:Company:[clé_unique]  caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'. Longueur maximale de la clé unique = 3."
+  referential_companies:
+    <<: *fr_companies
\ No newline at end of file