diff options
5 files changed, 11 insertions, 99 deletions
diff --git a/app/controllers/compliance_control_sets_controller.rb b/app/controllers/compliance_control_sets_controller.rb index ac07c5495..b8514e348 100644 --- a/app/controllers/compliance_control_sets_controller.rb +++ b/app/controllers/compliance_control_sets_controller.rb @@ -17,26 +17,15 @@ class ComplianceControlSetsController < InheritedResources::Base def show show! do |format| format.html { + @q_controls_form = @compliance_control_set.compliance_controls.ransack(params[:q]) @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_controls) + decorate_compliance_controls( @q_controls_form.result) .group_by(&:compliance_control_block) } end end - def simple - show! do | format | - format.html do - @compliance_controls = @compliance_control_set.compliance_controls - @q_controls_form = @compliance_controls.ransack(params[:q]) - @compliance_control_set = @compliance_control_set.decorate - end - end - end - def clone ComplianceControlSetCloner.new.copy(params[:id], current_organisation.id) flash[:notice] = I18n.t("compliance_control_sets.errors.operation_in_progress") diff --git a/app/views/compliance_control_sets/show.html.slim b/app/views/compliance_control_sets/show.html.slim index d0cbb0ca4..db0ed64ea 100644 --- a/app/views/compliance_control_sets/show.html.slim +++ b/app/views/compliance_control_sets/show.html.slim @@ -35,7 +35,7 @@ = transport_mode("", "") - direct_controls = @compliance_controls.delete nil - - if direct_controls.any? + - if direct_controls.try(:any?) .row .col-lg-12 .select_table @@ -67,7 +67,7 @@ - @compliance_controls.each do |block, compliance_controls| - - if compliance_controls.any? + - if compliance_controls.try(:any?) .row .col-lg-12 h2 @@ -107,6 +107,7 @@ sortable: true, cls: 'table has-filter has-search', model: ComplianceControl + .select_toolbox ul li.st_action.with_text diff --git a/app/views/compliance_control_sets/simple.html.slim b/app/views/compliance_control_sets/simple.html.slim deleted file mode 100644 index 73f127646..000000000 --- a/app/views/compliance_control_sets/simple.html.slim +++ /dev/null @@ -1,34 +0,0 @@ -/ PageHeader -= pageheader 'Simple', - t('compliance_control_sets.show.title', name: @compliance_control_set.name), - 'Lorem ipsum dolor sit amet' - - -/ 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 - - if params[:q].present? or @compliance_controls.any? - .row - .col-lg-12 - = render '/compliance_controls/simple_filters' - - - if @compliance_controls.any? - .row - .col-lg-12 - .select_table - table - thead - th id - th name - tbody - - @compliance_controls.each do | cc | - tr - td - = cc.id - td - = cc.name - diff --git a/app/views/compliance_controls/_filters.html.slim b/app/views/compliance_controls/_filters.html.slim index 55490e01b..75cb4b7f4 100644 --- a/app/views/compliance_controls/_filters.html.slim +++ b/app/views/compliance_controls/_filters.html.slim @@ -15,26 +15,20 @@ .ffg-row .form-group.togglable = f.label t('activerecord.models.compliance_control_block.one'), required: false, class: 'control-label' - = f.input :compliance_control_block_name_eq_any, + = f.input :compliance_control_block_id_eq_any, collection: @compliance_control_set.compliance_control_blocks, as: :check_boxes, - label: true, - label_method: lambda {|w| ("<span>#{w.name}</span>").html_safe}, + label: false, + label_method: lambda {|w| ("<span>#{transport_mode(w.transport_mode, w.transport_submode)}</span>").html_safe}, required: false, wrapper_html: {class: 'checkbox_list'} .form-group.togglable - = f.label t('compliance_controls.filters.comment'), required: false, class: 'control-label' - = f.collection_check_boxes :comment_eq_any, - @compliance_control_set.compliance_controls, - :id, :comment, - label: true, - wrapper_html: {class: 'checkbox_list'} - .form-group.togglable = f.label t('compliance_controls.filters.criticity'), required: false, class: 'control-label' - = f.input :criticity_eq, + = f.input :criticity_eq_any, collection: ComplianceControl.criticities, as: :check_boxes, - label: true, + label: false, + label_method: lambda {|w| ("<span>#{w}</span>").html_safe}, required: false, wrapper_html: {class: 'checkbox_list'} diff --git a/app/views/compliance_controls/_simple_filters.html.slim b/app/views/compliance_controls/_simple_filters.html.slim deleted file mode 100644 index da037c051..000000000 --- a/app/views/compliance_controls/_simple_filters.html.slim +++ /dev/null @@ -1,38 +0,0 @@ -= search_form_for @q_controls_form, - url: simple_compliance_control_set_path(@compliance_control_set), - builder: SimpleForm::FormBuilder, - class: 'form form-filter' do |f| - - .ffg-row - .input-group.search_bar - = f.search_field :name_cont, - class: 'form-control', - placeholder: t('compliance_controls.filters.name') - span.input-group-btn - button.btn.btn-default type='submit' - span.fa.fa-search - - .ffg-row - .form-group.togglable - = f.label t('activerecord.models.compliance_control_block.one'), required: false, class: 'control-label' - = f.input :compliance_control_block_id_eq_any, - collection: @compliance_control_set.compliance_control_blocks, - as: :check_boxes, - label: false, - label_method: lambda {|w| ("<span>#{w.name}</span>").html_safe}, - required: false, - wrapper_html: {class: 'checkbox_list'} - - .form-group.togglable - = f.label t('compliance_controls.filters.criticity'), required: false, class: 'control-label' - = f.input :criticity_eq, - collection: ComplianceControl.criticities, - as: :check_boxes, - label: false, - label_method: lambda {|w| ("<span>#{w}</span>").html_safe}, - required: false, - wrapper_html: {class: 'checkbox_list'} - - .actions - = link_to t('actions.erase'), @compliance_control_set, class: 'btn btn-link' - = f.submit t('actions.filter'), class: 'btn btn-default', id: 'compliance_control_set_compliance_controls_filter_btn' |