Refs #4615 Change spec and controller regarding to the ComplianceControl models changes

2 files changed, 5 insertions, 5 deletions

diff --git a/app/controllers/compliance_controls_controller.rb b/app/controllers/compliance_controls_controller.rb
index 7deeab01d..b4fb2f1de 100644
--- a/app/controllers/compliance_controls_controller.rb
+++ b/app/controllers/compliance_controls_controller.rb
@@ -19,7 +19,7 @@ class ComplianceControlsController < BreadcrumbController
   end
 
   def compliance_control_params
-    base = [:name, :code, :criticity, :comment, :control_attributes, :type, compliance_control_block_attributes: [:name, :transport_mode]]
+    base = [:name, :code, :origin_code, :criticity, :comment, :control_attributes, :type, compliance_control_block_attributes: [:name, :transport_mode]]
     permited = base + dynamic_attributes_params
     params.require(:compliance_control).permit(permited)
   end
diff --git a/app/models/compliance_control.rb b/app/models/compliance_control.rb
index 9c3083695..c5389e832 100644
--- a/app/models/compliance_control.rb
+++ b/app/models/compliance_control.rb
@@ -29,10 +29,10 @@ class ComplianceControl < ActiveRecord::Base
   end
 
   before_validation(on: :create) do
-    self.name = self.class.name
-    self.code = @@default_code
-    self.origin_code = @@default_code
-    self.criticity = @@default_criticity
+   self.name ||= self.class.name
+   self.code ||= @@default_code
+   self.origin_code ||= @@default_code
+   self.criticity ||= @@default_criticity
   end
 
 end