From 00d1aff0f61be908ad9dfedff47f33f5ef1f274a Mon Sep 17 00:00:00 2001 From: Xinhui Date: Wed, 20 Sep 2017 14:28:22 +0200 Subject: Add type to permited params & remove policy check --- app/controllers/compliance_controls_controller.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'app/controllers/compliance_controls_controller.rb') diff --git a/app/controllers/compliance_controls_controller.rb b/app/controllers/compliance_controls_controller.rb index dad9b935a..75c2dbc72 100644 --- a/app/controllers/compliance_controls_controller.rb +++ b/app/controllers/compliance_controls_controller.rb @@ -1,5 +1,4 @@ class ComplianceControlsController < BreadcrumbController - include PolicyChecker defaults resource_class: ComplianceControl belongs_to :compliance_control_set @@ -33,6 +32,6 @@ class ComplianceControlsController < BreadcrumbController end def compliance_control_params - params.require(:compliance_control).permit(:name, :code, :criticity, :comment, :control_attributes) + params.require(:compliance_control).permit(:name, :code, :criticity, :comment, :control_attributes, :type) end end -- cgit v1.2.3 From 8052230ad2966e794fe85ac48244012b4a74d6d3 Mon Sep 17 00:00:00 2001 From: Xinhui Date: Thu, 21 Sep 2017 11:47:18 +0200 Subject: Move ComplianceControl#index into ComplianceControlSet#show Refs #4579 --- app/controllers/compliance_controls_controller.rb | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'app/controllers/compliance_controls_controller.rb') diff --git a/app/controllers/compliance_controls_controller.rb b/app/controllers/compliance_controls_controller.rb index 75c2dbc72..87dfcf15b 100644 --- a/app/controllers/compliance_controls_controller.rb +++ b/app/controllers/compliance_controls_controller.rb @@ -2,14 +2,6 @@ class ComplianceControlsController < BreadcrumbController defaults resource_class: ComplianceControl belongs_to :compliance_control_set - def index - index! do |format| - format.html { - @compliance_controls = decorate_compliance_controls(@compliance_controls) - } - end - end - def create create!(notice: t('notice.compliance_control.created')) end @@ -24,13 +16,6 @@ class ComplianceControlsController < BreadcrumbController end private - def decorate_compliance_controls(compliance_controls) - ModelDecorator.decorate( - compliance_controls, - with: ComplianceControlDecorator, - ) - end - def compliance_control_params params.require(:compliance_control).permit(:name, :code, :criticity, :comment, :control_attributes, :type) end -- cgit v1.2.3 From d5e8f6ff7bcf443bcfd3d525e888da883d8ae32c Mon Sep 17 00:00:00 2001 From: Xinhui Date: Thu, 21 Sep 2017 14:30:13 +0200 Subject: Manually specifying policy classes for ComplianceControl & children Refs #4581 --- app/controllers/compliance_controls_controller.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'app/controllers/compliance_controls_controller.rb') diff --git a/app/controllers/compliance_controls_controller.rb b/app/controllers/compliance_controls_controller.rb index 87dfcf15b..c5c76fd58 100644 --- a/app/controllers/compliance_controls_controller.rb +++ b/app/controllers/compliance_controls_controller.rb @@ -1,4 +1,5 @@ class ComplianceControlsController < BreadcrumbController + include PolicyChecker defaults resource_class: ComplianceControl belongs_to :compliance_control_set -- cgit v1.2.3 From 15e75e3505194171df43d69096e94f65f032f9e5 Mon Sep 17 00:00:00 2001 From: Xinhui Date: Fri, 22 Sep 2017 14:36:13 +0200 Subject: Nested compliance control block Refs #4585 --- app/controllers/compliance_controls_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers/compliance_controls_controller.rb') diff --git a/app/controllers/compliance_controls_controller.rb b/app/controllers/compliance_controls_controller.rb index c5c76fd58..bfa7cbefa 100644 --- a/app/controllers/compliance_controls_controller.rb +++ b/app/controllers/compliance_controls_controller.rb @@ -18,6 +18,6 @@ class ComplianceControlsController < BreadcrumbController private def compliance_control_params - params.require(:compliance_control).permit(:name, :code, :criticity, :comment, :control_attributes, :type) + params.require(:compliance_control).permit(:name, :code, :criticity, :comment, :control_attributes, :type, compliance_control_block_attributes: [:name]) end end -- cgit v1.2.3 From 5724f7c02a5238ef727e0c1674f2c69424563527 Mon Sep 17 00:00:00 2001 From: Xinhui Date: Tue, 26 Sep 2017 11:42:47 +0200 Subject: Nested form for compliance control block Refs #4585 --- app/controllers/compliance_controls_controller.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'app/controllers/compliance_controls_controller.rb') diff --git a/app/controllers/compliance_controls_controller.rb b/app/controllers/compliance_controls_controller.rb index bfa7cbefa..0f4ca3481 100644 --- a/app/controllers/compliance_controls_controller.rb +++ b/app/controllers/compliance_controls_controller.rb @@ -3,6 +3,12 @@ class ComplianceControlsController < BreadcrumbController defaults resource_class: ComplianceControl belongs_to :compliance_control_set + def new + @compliance_control_set = parent + @compliance_control = ComplianceControl.new + @compliance_control.build_compliance_control_block + end + def create create!(notice: t('notice.compliance_control.created')) end @@ -18,6 +24,6 @@ class ComplianceControlsController < BreadcrumbController private def compliance_control_params - params.require(:compliance_control).permit(:name, :code, :criticity, :comment, :control_attributes, :type, compliance_control_block_attributes: [:name]) + params.require(:compliance_control).permit(:name, :code, :criticity, :comment, :control_attributes, :type, compliance_control_block_attributes: [:name, :transport_mode]) end end -- cgit v1.2.3 From 47aa20b9490166a9e0edd7e2095fc8612ff8f892 Mon Sep 17 00:00:00 2001 From: Xinhui Date: Tue, 26 Sep 2017 12:35:38 +0200 Subject: Remove action override, notice is now handle by gem responder --- app/controllers/compliance_controls_controller.rb | 8 -------- 1 file changed, 8 deletions(-) (limited to 'app/controllers/compliance_controls_controller.rb') diff --git a/app/controllers/compliance_controls_controller.rb b/app/controllers/compliance_controls_controller.rb index 0f4ca3481..20f4b15af 100644 --- a/app/controllers/compliance_controls_controller.rb +++ b/app/controllers/compliance_controls_controller.rb @@ -9,19 +9,11 @@ class ComplianceControlsController < BreadcrumbController @compliance_control.build_compliance_control_block end - def create - create!(notice: t('notice.compliance_control.created')) - end - def update path = compliance_control_set_compliance_control_path(parent, resource) update!(notice: t('notice.compliance_control.updated')) { path } end - def destroy - destroy!(notice: t('notice.compliance_control.destroyed')) - end - private def compliance_control_params params.require(:compliance_control).permit(:name, :code, :criticity, :comment, :control_attributes, :type, compliance_control_block_attributes: [:name, :transport_mode]) -- cgit v1.2.3 From c3f80c537e28dfe316ee0dcbee2bde2b5307fd79 Mon Sep 17 00:00:00 2001 From: Xinhui Date: Wed, 27 Sep 2017 11:59:44 +0200 Subject: Support of dynamic_attributes in form Refs #4467 --- app/controllers/compliance_controls_controller.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'app/controllers/compliance_controls_controller.rb') diff --git a/app/controllers/compliance_controls_controller.rb b/app/controllers/compliance_controls_controller.rb index 20f4b15af..71d702945 100644 --- a/app/controllers/compliance_controls_controller.rb +++ b/app/controllers/compliance_controls_controller.rb @@ -5,7 +5,7 @@ class ComplianceControlsController < BreadcrumbController def new @compliance_control_set = parent - @compliance_control = ComplianceControl.new + @compliance_control = GenericAttributeMinMax.new @compliance_control.build_compliance_control_block end @@ -15,7 +15,13 @@ class ComplianceControlsController < BreadcrumbController end private + def dynamic_attributes_params + params.require(:compliance_control).permit(:type).values[0].constantize.dynamic_attributes + end + def compliance_control_params - params.require(:compliance_control).permit(:name, :code, :criticity, :comment, :control_attributes, :type, compliance_control_block_attributes: [:name, :transport_mode]) + base = [:name, :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 end -- cgit v1.2.3 From 750815f4513dfa8c57238fdfaaee07af02b0e8cd Mon Sep 17 00:00:00 2001 From: Xinhui Date: Wed, 20 Sep 2017 14:28:22 +0200 Subject: Add type to permited params & remove policy check --- app/controllers/compliance_controls_controller.rb | 1 - 1 file changed, 1 deletion(-) (limited to 'app/controllers/compliance_controls_controller.rb') diff --git a/app/controllers/compliance_controls_controller.rb b/app/controllers/compliance_controls_controller.rb index 71d702945..7deeab01d 100644 --- a/app/controllers/compliance_controls_controller.rb +++ b/app/controllers/compliance_controls_controller.rb @@ -1,5 +1,4 @@ class ComplianceControlsController < BreadcrumbController - include PolicyChecker defaults resource_class: ComplianceControl belongs_to :compliance_control_set -- cgit v1.2.3 From 5911206bbadb2c3c9609f8be0ce1affd6584015e Mon Sep 17 00:00:00 2001 From: cedricnjanga Date: Wed, 27 Sep 2017 16:08:19 +0200 Subject: Refs #4615 Change spec and controller regarding to the ComplianceControl models changes --- app/controllers/compliance_controls_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers/compliance_controls_controller.rb') 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 -- cgit v1.2.3 From 28a352d2c4cba71c796a3504513e0664cec92cb5 Mon Sep 17 00:00:00 2001 From: cedricnjanga Date: Wed, 27 Sep 2017 16:34:02 +0200 Subject: Refs #4615 Resolve rebase conflict --- app/controllers/compliance_controls_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers/compliance_controls_controller.rb') diff --git a/app/controllers/compliance_controls_controller.rb b/app/controllers/compliance_controls_controller.rb index b4fb2f1de..eb1ba68ea 100644 --- a/app/controllers/compliance_controls_controller.rb +++ b/app/controllers/compliance_controls_controller.rb @@ -4,7 +4,7 @@ class ComplianceControlsController < BreadcrumbController def new @compliance_control_set = parent - @compliance_control = GenericAttributeMinMax.new + @compliance_control = GenericAttributeControl::MinMax.new @compliance_control.build_compliance_control_block end -- cgit v1.2.3