add button link to compliance control blocks/select type in compliance control set show, update compliance control set decorator

2 files changed, 8 insertions, 6 deletions

diff --git a/app/decorators/compliance_control_set_decorator.rb b/app/decorators/compliance_control_set_decorator.rb
index 6a9040358..f4aa607e1 100644
--- a/app/decorators/compliance_control_set_decorator.rb
+++ b/app/decorators/compliance_control_set_decorator.rb
@@ -20,12 +20,6 @@ class ComplianceControlSetDecorator < Draper::Decorator
       )
     # end
 
-    # if h.policy(ComplianceControl).create?
-      links << Link.new(
-        content: h.t('compliance_control_sets.actions.add_compliance_control'),
-        href:  h.select_type_compliance_control_set_compliance_controls_path(object.id)
-      )
-    # end
     links
   end
 
diff --git a/app/views/compliance_control_sets/show.html.slim b/app/views/compliance_control_sets/show.html.slim
index d7d4678ba..3b0a123aa 100644
--- a/app/views/compliance_control_sets/show.html.slim
+++ b/app/views/compliance_control_sets/show.html.slim
@@ -56,4 +56,12 @@
               sortable: true,
               cls: 'table has-filter has-search'
 
+        .select_toolbox
+          ul
+            li.st_action
+              = link_to select_type_compliance_control_set_compliance_controls_path(@compliance_control_set.id)
+                span.fa.fa-plus
+            li.st_action
+              = link_to new_compliance_control_set_compliance_control_block_path(@compliance_control_set.id)
+                span.fa.fa-plus-square