aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/controllers/compliance_check_sets_controller.rb13
-rw-r--r--app/decorators/compliance_check_decorator.rb8
-rw-r--r--app/decorators/compliance_check_set_decorator.rb2
3 files changed, 4 insertions, 19 deletions
diff --git a/app/controllers/compliance_check_sets_controller.rb b/app/controllers/compliance_check_sets_controller.rb
index 9882d6aca..271598428 100644
--- a/app/controllers/compliance_check_sets_controller.rb
+++ b/app/controllers/compliance_check_sets_controller.rb
@@ -40,18 +40,9 @@ class ComplianceCheckSetsController < ChouetteController
def executed_for_html
@q_checks_form = @compliance_check_set.compliance_checks.ransack(params[:q])
@compliance_check_set = @compliance_check_set.decorate
- compliance_checks =
- decorate_compliance_checks( @q_checks_form.result)
- .group_by(&:compliance_check_block)
+ compliance_checks = @q_checks_form.result
+ .group_by(&:compliance_check_block)
@direct_compliance_checks = compliance_checks.delete nil
@blocks_to_compliance_checks_map = compliance_checks
end
-
- # Decoration
- # ----------
- def decorate_compliance_checks(compliance_checks)
- ModelDecorator.decorate(
- compliance_checks,
- with: ComplianceCheckDecorator)
- end
end
diff --git a/app/decorators/compliance_check_decorator.rb b/app/decorators/compliance_check_decorator.rb
deleted file mode 100644
index 5431f5796..000000000
--- a/app/decorators/compliance_check_decorator.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class ComplianceCheckDecorator < Draper::Decorator
- delegate_all
-
- def action_links
- []
- end
-
-end
diff --git a/app/decorators/compliance_check_set_decorator.rb b/app/decorators/compliance_check_set_decorator.rb
index 1a9c19546..334f39e88 100644
--- a/app/decorators/compliance_check_set_decorator.rb
+++ b/app/decorators/compliance_check_set_decorator.rb
@@ -1,4 +1,6 @@
class ComplianceCheckSetDecorator < AF83::Decorator
+ decorates ComplianceCheckSet
+
with_instance_decorator do |instance_decorator|
instance_decorator.show_action_link
end