aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/compliance_controls_controller.rb
diff options
context:
space:
mode:
authorLuc Donnet2017-10-16 18:03:09 +0200
committerLuc Donnet2017-10-16 18:03:30 +0200
commitd048d6b0880a011ad50cd153603b7d0954f2ce6d (patch)
treeb779df33967ae20cb0726cfbd9b8289b8e7b08d0 /app/controllers/compliance_controls_controller.rb
parent99d2e53ff5dfb947c63c0bf360a97ef64565ed47 (diff)
downloadchouette-core-d048d6b0880a011ad50cd153603b7d0954f2ce6d.tar.bz2
Fix build resource creation for compliance_control Refs #4728
Diffstat (limited to 'app/controllers/compliance_controls_controller.rb')
-rw-r--r--app/controllers/compliance_controls_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/compliance_controls_controller.rb b/app/controllers/compliance_controls_controller.rb
index 6fe799267..e067174bb 100644
--- a/app/controllers/compliance_controls_controller.rb
+++ b/app/controllers/compliance_controls_controller.rb
@@ -27,7 +27,7 @@ class ComplianceControlsController < BreadcrumbController
alias_method :compliance_control, :resource
def build_resource
- @compliance_control ||= compliance_control_class.new compliance_control_set: parent
+ get_resource_ivar || set_resource_ivar(compliance_control_class.send(:new, *resource_params))
end
private
@@ -41,7 +41,7 @@ class ComplianceControlsController < BreadcrumbController
end
def compliance_control_params
- base = [:name, :code, :origin_code, :criticity, :comment, :control_attributes, :type, :compliance_control_block_id]
+ base = [:name, :code, :origin_code, :criticity, :comment, :control_attributes, :type, :compliance_control_block_id, :compliance_control_set_id]
permitted = base + dynamic_attributes_params
params.require(:compliance_control).permit(permitted)
end