diff options
| -rw-r--r-- | app/controllers/compliance_controls_controller.rb | 4 | ||||
| -rw-r--r-- | app/views/compliance_controls/_form.html.slim | 1 |
2 files changed, 3 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 diff --git a/app/views/compliance_controls/_form.html.slim b/app/views/compliance_controls/_form.html.slim index cf9d7379a..d342f120a 100644 --- a/app/views/compliance_controls/_form.html.slim +++ b/app/views/compliance_controls/_form.html.slim @@ -3,6 +3,7 @@ .col-lg-12 = f.input :name = f.input :type, as: :hidden + = f.input :compliance_control_set_id, as: :hidden, input_html: { value: @compliance_control_set.id } = f.input :code = f.input :criticity = f.association :compliance_control_block, collection: @compliance_control_set.compliance_control_blocks, label_method: lambda { |block| transport_mode(block.transport_mode, block.transport_submode) } |