diff options
| -rw-r--r-- | app/controllers/compliance_control_sets_controller.rb | 11 | ||||
| -rw-r--r-- | app/views/compliance_control_sets/grouping.html.slim | 39 | ||||
| -rw-r--r-- | app/views/compliance_control_sets/show.html.slim | 12 | ||||
| -rw-r--r-- | config/routes.rb | 1 |
4 files changed, 10 insertions, 53 deletions
diff --git a/app/controllers/compliance_control_sets_controller.rb b/app/controllers/compliance_control_sets_controller.rb index 7d695a197..65bb3b22e 100644 --- a/app/controllers/compliance_control_sets_controller.rb +++ b/app/controllers/compliance_control_sets_controller.rb @@ -18,7 +18,9 @@ class ComplianceControlSetsController < InheritedResources::Base show! do |format| format.html { @compliance_control_set = @compliance_control_set.decorate - @compliance_controls_without_block = decorate_compliance_controls(@compliance_control_set.compliance_controls.where(compliance_control_block_id: nil)) + @compliance_controls = + decorate_compliance_controls(@compliance_control_set.compliance_controls) + .group_by(&:compliance_control_block) } end end @@ -29,13 +31,6 @@ class ComplianceControlSetsController < InheritedResources::Base redirect_to(compliance_control_sets_path) end - def grouping - show! do | format | - format.html do - @controls = @compliance_control_set.compliance_controls.to_a - end - end - end protected def begin_of_association_chain diff --git a/app/views/compliance_control_sets/grouping.html.slim b/app/views/compliance_control_sets/grouping.html.slim deleted file mode 100644 index d527601b2..000000000 --- a/app/views/compliance_control_sets/grouping.html.slim +++ /dev/null @@ -1,39 +0,0 @@ -/ PageContent -.page_content - .container-fluid - .row - .col-lg-6.col-md-6.col-sm-12.col-xs-12 - = definition_list t('metadatas'), - ComplianceControlSet.human_attribute_name(:name) => @compliance_control_set.name - .row - .col-lg-12 - h2 - = transport_mode("", "") - .row - .col-lg-12 - .select_table - = table_builder_2 @coontrols, \ - [ \ - TableBuilderHelper::Column.new( \ - key: :code, \ - attribute: 'code' \ - ), \ - TableBuilderHelper::Column.new( \ - key: :name, \ - attribute: 'name', \ - link_to: lambda do |compliance_control| \ - compliance_control_set_compliance_control_path(@compliance_control_set, compliance_control) \ - end \ - ), \ - TableBuilderHelper::Column.new( \ - key: :criticity, \ - attribute: 'criticity' \ - ), \ - TableBuilderHelper::Column.new( \ - key: :comment, \ - attribute: 'comment' \ - ), \ - ], - sortable: true, - cls: 'table has-filter has-search' - diff --git a/app/views/compliance_control_sets/show.html.slim b/app/views/compliance_control_sets/show.html.slim index cf236feb8..28d602eb5 100644 --- a/app/views/compliance_control_sets/show.html.slim +++ b/app/views/compliance_control_sets/show.html.slim @@ -31,7 +31,7 @@ .row .col-lg-12 .select_table - = table_builder_2 @compliance_controls_without_block, + = table_builder_2 @compliance_controls.delete(nil), [ \ TableBuilderHelper::Column.new( \ key: :code, \ @@ -54,9 +54,10 @@ ), \ ], sortable: true, - cls: 'table has-filter has-search' + cls: 'table has-filter has-search', + model: ComplianceControl - - @compliance_control_set.compliance_control_blocks.each do |block| + - @compliance_controls.each do |block, compliance_controls| .row .col-lg-12 h2 @@ -71,7 +72,7 @@ .row .col-lg-12 .select_table - = table_builder_2 ModelDecorator.decorate(block.compliance_controls, with: ComplianceControlDecorator), + = table_builder_2 compliance_controls, [ \ TableBuilderHelper::Column.new( \ key: :code, \ @@ -94,7 +95,8 @@ ), \ ], sortable: true, - cls: 'table has-filter has-search' + cls: 'table has-filter has-search', + model: ComplianceControl .select_toolbox ul li.st_action.with_text diff --git a/config/routes.rb b/config/routes.rb index 41897e159..b105e77d6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -75,7 +75,6 @@ ChouetteIhm::Application.routes.draw do resources :compliance_control_sets do get :clone, on: :member - get :grouping, on: :member resources :compliance_controls, except: :index do get :select_type, on: :collection end |