diff options
| author | Xinhui | 2017-10-04 11:57:25 +0200 |
|---|---|---|
| committer | Xinhui | 2017-10-04 11:57:25 +0200 |
| commit | 383a0d823ebf875baa08f77ccb0eb8a0f06b866e (patch) | |
| tree | 00e8c11c0f58a7d48abae829182921ccf71cf582 /app | |
| parent | dc4ce3561c2e51d116f4a6533d8d64348d7460ab (diff) | |
| download | chouette-core-383a0d823ebf875baa08f77ccb0eb8a0f06b866e.tar.bz2 | |
ComplianceControls#new add association field compliance_control_block
Refs #4689
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/compliance_controls_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/compliance_control_block.rb | 3 | ||||
| -rw-r--r-- | app/views/compliance_controls/_form.html.slim | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/compliance_controls_controller.rb b/app/controllers/compliance_controls_controller.rb index fc4322c76..d7d84afb3 100644 --- a/app/controllers/compliance_controls_controller.rb +++ b/app/controllers/compliance_controls_controller.rb @@ -25,7 +25,7 @@ class ComplianceControlsController < BreadcrumbController end def compliance_control_params - base = [:name, :code, :origin_code, :criticity, :comment, :control_attributes, :type] + base = [:name, :code, :origin_code, :criticity, :comment, :control_attributes, :type, :compliance_control_block_id] permited = base + dynamic_attributes_params params.require(:compliance_control).permit(permited) end diff --git a/app/models/compliance_control_block.rb b/app/models/compliance_control_block.rb index 5721c00f4..2be8d98a0 100644 --- a/app/models/compliance_control_block.rb +++ b/app/models/compliance_control_block.rb @@ -12,4 +12,7 @@ class ComplianceControlBlock < ActiveRecord::Base validates :transport_mode, presence: true validates :compliance_control_set, presence: true + def label_method + [transport_mode, transport_submode].compact.map {|x| "[#{x}]"}.join + end end diff --git a/app/views/compliance_controls/_form.html.slim b/app/views/compliance_controls/_form.html.slim index 3928f3550..1e56a63b9 100644 --- a/app/views/compliance_controls/_form.html.slim +++ b/app/views/compliance_controls/_form.html.slim @@ -5,6 +5,7 @@ = f.input :type, as: :select, collection: ComplianceControl.subclasses = f.input :code = f.input :criticity + = f.association :compliance_control_block, collection: @compliance_control_set.compliance_control_blocks, label_method: :label_method = f.input :comment - f.object.class.dynamic_attributes.each do |attribute| |