diff options
| -rw-r--r-- | app/helpers/compliance_control_sets_helper.rb | 89 | ||||
| -rw-r--r-- | app/views/compliance_control_sets/show.html.slim | 3 |
2 files changed, 5 insertions, 87 deletions
diff --git a/app/helpers/compliance_control_sets_helper.rb b/app/helpers/compliance_control_sets_helper.rb index b5d0c5afc..04dfe1f51 100644 --- a/app/helpers/compliance_control_sets_helper.rb +++ b/app/helpers/compliance_control_sets_helper.rb @@ -4,12 +4,12 @@ module ComplianceControlSetsHelper [current_organisation, Organisation.find_by_name("STIF")].uniq end - def flotted_links ccs_id = @compliance_control_set + def floated_links ccs_id links = [new_control(ccs_id), new_block(ccs_id)] - unless links.all? &:nil? + if links.any? content_tag :div, class: 'select_toolbox' do content_tag :ul do - links.collect {|link| concat content_tag(:li, link, class: 'st_action with_text') unless link.nil?} + links.collect {|link| concat content_tag(:li, link, class: 'st_action with_text') if link} end end end @@ -21,8 +21,6 @@ module ComplianceControlSetsHelper concat content_tag :span, nil, class: 'fa fa-plus' concat content_tag :span, t('compliance_control_sets.actions.add_compliance_control') end - else - nil end end @@ -32,85 +30,6 @@ module ComplianceControlSetsHelper concat content_tag :span, nil, class: 'fa fa-plus' concat content_tag :span,t('compliance_control_sets.actions.add_compliance_control_block') end - else - nil end end - - def render_compliance_control_block(block=nil) - content_tag :div, class: 'row' do - content_tag :div, class: 'col-lg-12' do - content_tag :h2 do - concat transport_mode_text(block) - concat dropdown(block) if block - end - end - end - end - - def dropdown(block) - dropdown_button = content_tag :div, class: 'btn dropdown-toggle', "data-toggle": "dropdown" do - content_tag :div, nil, class: 'span fa fa-cog' - end - - dropdown_menu = content_tag :ul, class: 'dropdown-menu' do - link_1 = content_tag :li do - link_to t('compliance_control_sets.actions.edit'), edit_compliance_control_set_compliance_control_block_path(@compliance_control_set.id, block.id) - end - link_2 = content_tag :li do - link_to t('compliance_control_sets.actions.destroy'), compliance_control_set_compliance_control_block_path(@compliance_control_set.id, block.id), :method => :delete, :data => {:confirm => t('compliance_control_sets.actions.destroy_confirm')} - end - link_1 + link_2 - end - - content_tag :div, class: 'btn-group' do - dropdown_button + dropdown_menu - end - - end - - def render_compliance_controls(compliance_controls) - content_tag :div, class: 'row' do - content_tag :div, class: 'col-lg-12' do - compliance_controls.try(:any?) ? render_table_builder(compliance_controls) : render_no_controls - end - end - - end - - def render_table_builder(compliance_controls) - table = content_tag :div, class: 'select_table' do - table_builder_2 compliance_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 - end - metas = content_tag :div, I18n.t('compliance_control_blocks.metas.control', count: compliance_controls.count), class: 'pull-right' - table + metas - end - - def render_no_controls - content_tag :div, I18n.t('compliance_control_blocks.metas.control.zero'), class: 'alert alert-warning' - end -end
\ No newline at end of file +end diff --git a/app/views/compliance_control_sets/show.html.slim b/app/views/compliance_control_sets/show.html.slim index 4385505b0..9cbf8acdf 100644 --- a/app/views/compliance_control_sets/show.html.slim +++ b/app/views/compliance_control_sets/show.html.slim @@ -46,5 +46,4 @@ .col-lg-12 = replacement_msg t('compliance_controls.search_no_results') - / flotted buttons - = flotted_links @compliance_control_set.id + = floated_links @compliance_control_set.id |