From bd9cd955e7855d7f8fc9f369e47d50f3a8ba718d Mon Sep 17 00:00:00 2001
From: Teddy Wing
Date: Thu, 25 Jan 2018 16:02:09 +0100
Subject: ComplianceCheckSets#executed: Don't decorate `ComplianceCheck`s

No action links are used on these objects and the decorator isn't being
used for anything else. Seems to me like this collection doesn't need to
be decorated at all. Get rid of the decorator.

Add a `decorates` to `ComplianceCheckSetDecorator` because
http://stif-boiv.dev:3000/workbenches/1/compliance_check_sets/14/executed
causes an uninferrable thing error.

Refs #5586
---
 app/controllers/compliance_check_sets_controller.rb | 13 ++-----------
 app/decorators/compliance_check_decorator.rb        |  8 --------
 app/decorators/compliance_check_set_decorator.rb    |  2 ++
 3 files changed, 4 insertions(+), 19 deletions(-)
 delete mode 100644 app/decorators/compliance_check_decorator.rb

diff --git a/app/controllers/compliance_check_sets_controller.rb b/app/controllers/compliance_check_sets_controller.rb
index d05a81d61..87f427776 100644
--- a/app/controllers/compliance_check_sets_controller.rb
+++ b/app/controllers/compliance_check_sets_controller.rb
@@ -42,18 +42,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
-- 
cgit v1.2.3