diff options
| -rw-r--r-- | app/controllers/compliance_control_sets_controller.rb | 6 | ||||
| -rw-r--r-- | app/views/compliance_control_sets/show.html.slim | 73 | ||||
| -rw-r--r-- | app/views/compliance_controls/_filters.html.slim | 5 |
3 files changed, 43 insertions, 41 deletions
diff --git a/app/controllers/compliance_control_sets_controller.rb b/app/controllers/compliance_control_sets_controller.rb index 65bb3b22e..f576a55c5 100644 --- a/app/controllers/compliance_control_sets_controller.rb +++ b/app/controllers/compliance_control_sets_controller.rb @@ -18,9 +18,11 @@ class ComplianceControlSetsController < InheritedResources::Base show! do |format| format.html { @compliance_control_set = @compliance_control_set.decorate + @compliance_controls = @compliance_control_set.compliance_controls + @q_controls_form = @compliance_controls.ransack(params[:q]) @compliance_controls = - decorate_compliance_controls(@compliance_control_set.compliance_controls) - .group_by(&:compliance_control_block) + decorate_compliance_controls( @compliance_controls) + .group_by(&:compliance_control_block) } end end diff --git a/app/views/compliance_control_sets/show.html.slim b/app/views/compliance_control_sets/show.html.slim index 621c188e4..d0cbb0ca4 100644 --- a/app/views/compliance_control_sets/show.html.slim +++ b/app/views/compliance_control_sets/show.html.slim @@ -24,51 +24,48 @@ .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 + - if params[:q].present? or @compliance_controls.any? + .row + .col-lg-12 + = render '/compliance_controls/filters' + .row .col-lg-12 h2 = transport_mode("", "") - - direct_controls = @compliance_controls.delete nil - - if params[:q].present? or direct_controls.any? - .row - .col-lg-12 - = render '/compliance_controls/filter', controls: direct_controls - - - if direct_controls.any? - .row - .col-lg-12 - .select_table - = table_builder_2 direct_controls, - [ \ - 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', - model: ComplianceControl + - direct_controls = @compliance_controls.delete nil - - @compliance_controls.each do |block, compliance_controls| - - if params[:q].present? or compliance_controls.any? + - if direct_controls.any? .row .col-lg-12 - = render '/compliance_controls/filter', controls: compliance_controls + .select_table + = table_builder_2 direct_controls, + [ \ + 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', + model: ComplianceControl + + - @compliance_controls.each do |block, compliance_controls| - if compliance_controls.any? .row diff --git a/app/views/compliance_controls/_filters.html.slim b/app/views/compliance_controls/_filters.html.slim index 6e9505fea..b9cb69a2a 100644 --- a/app/views/compliance_controls/_filters.html.slim +++ b/app/views/compliance_controls/_filters.html.slim @@ -1,4 +1,7 @@ -= search_form_for @q_controls_form, url: compliance_control_set_compliance_controls_path, builder: SimpleForm::FormBuilder, class: 'form form-filter' do |f| += search_form_for @q_controls_form, + url: compliance_control_set_compliance_controls_path(@compliance_control_set), + builder: SimpleForm::FormBuilder, + class: 'form form-filter' do |f| // Rewriting the ransack filter copied from cc_stes/_filter .ffg-row |