Refs: #4823@0.2h; Last CR

1 files changed, 58 insertions, 47 deletions

diff --git a/app/views/compliance_control_sets/show.html.slim b/app/views/compliance_control_sets/show.html.slim
index 27f8b4e2c..71b71f842 100644
--- a/app/views/compliance_control_sets/show.html.slim
+++ b/app/views/compliance_control_sets/show.html.slim
@@ -31,15 +31,58 @@
         = render '/compliance_controls/filters'
 
 
-      - if @direct_compliance_controls.try(:any?)
+    - if @direct_compliance_controls.try(:any?)
+      .row
+        .col-lg-12
+          h2
+            = transport_mode_text()
+      .row
+        .col-lg-12
+          .select_table
+            = table_builder_2 @direct_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
+
+    - @blocks_to_compliance_controls_map.each do |block, compliance_controls|
+
+      - if compliance_controls.try(:any?)
         .row
           .col-lg-12
             h2
-              = transport_mode_text()
+              = transport_mode_text(block)
+              .btn-group
+                .btn.dropdown-toggle{ data-toggle="dropdown" }
+                  .span.fa.fa-cog
+                ul.dropdown-menu
+                  li
+                    = link_to t('compliance_control_sets.actions.edit'), edit_compliance_control_set_compliance_control_block_path(@compliance_control_set.id, block.id)
+                    = 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')}
         .row
           .col-lg-12
             .select_table
-              = table_builder_2 @direct_compliance_controls,
+              = table_builder_2 compliance_controls,
                       [ \
                   TableBuilderHelper::Column.new( \
                     key: :code, \
@@ -65,47 +108,15 @@
                 cls: 'table has-filter has-search',
                 model: ComplianceControl
 
-    - @blocks_to_compliance_controls_map.each do |block, compliance_controls|
-
-      - if compliance_controls.try(:any?)
-        .row
-          .col-lg-12
-            h2
-              = transport_mode_text(block)
-              .btn-group
-                .btn.dropdown-toggle{ data-toggle="dropdown" }
-                  .span.fa.fa-cog
-                ul.dropdown-menu
-                  li
-                    = link_to t('compliance_control_sets.actions.edit'), edit_compliance_control_set_compliance_control_block_path(@compliance_control_set.id, block.id) if policy(ComplianceControlBlock).update? if policy(ComplianceControlBlock).update?
-                    = 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')} if policy(ComplianceControlBlock).destroy?
-          .row
-            .col-lg-12
-              .select_table
-                = 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
-
-  = flotted_links(@compliance_control_set.id)
\ No newline at end of file
+    .select_toolbox
+      ul
+        li.st_action.with_text
+          = link_to select_type_compliance_control_set_compliance_controls_path(@compliance_control_set.id)
+            span.fa.fa-plus
+            span
+              = t('compliance_control_sets.actions.add_compliance_control')
+        li.st_action.with_text
+          = link_to new_compliance_control_set_compliance_control_block_path(@compliance_control_set.id)
+            span.fa.fa-plus
+            span
+              = t('compliance_control_sets.actions.add_compliance_control_block')