Fix prerequisite access for compliance_check and compliance_control Refs #5878 @1

4 files changed, 6 insertions, 4 deletions

diff --git a/app/controllers/compliance_checks_controller.rb b/app/controllers/compliance_checks_controller.rb
index f6659ab9f..ad32bc538 100644
--- a/app/controllers/compliance_checks_controller.rb
+++ b/app/controllers/compliance_checks_controller.rb
@@ -1,4 +1,5 @@
 class ComplianceChecksController <  InheritedResources::Base
-  belongs_to :workbench
-  belongs_to :compliance_check_set
+  belongs_to :workbench do
+    belongs_to :compliance_check_set
+  end
 end
diff --git a/app/models/compliance_check.rb b/app/models/compliance_check.rb
index fda95ea08..9d817e146 100644
--- a/app/models/compliance_check.rb
+++ b/app/models/compliance_check.rb
@@ -18,5 +18,6 @@ class ComplianceCheck < ActiveRecord::Base
   end
 
   delegate :predicate, to: :control_class, allow_nil: true
+  delegate :prerequisite, to: :control_class, allow_nil: true
 
 end
diff --git a/app/models/compliance_control.rb b/app/models/compliance_control.rb
index 7cd9ba933..537343005 100644
--- a/app/models/compliance_control.rb
+++ b/app/models/compliance_control.rb
@@ -30,6 +30,7 @@ class ComplianceControl < ActiveRecord::Base
     end
 
     def predicate; I18n.t("compliance_controls.#{self.name.underscore}.description") end
+    def prerequisite; I18n.t("compliance_controls.#{self.name.underscore}.prerequisite") end
   end
 
   extend Enumerize
@@ -63,6 +64,7 @@ class ComplianceControl < ActiveRecord::Base
   end
 
   def predicate; self.class.predicate end
+  def prerequisite; self.class.prerequisite end
 
 end
 
diff --git a/app/models/concerns/compliance_item_support.rb b/app/models/concerns/compliance_item_support.rb
index 4ec2f130f..f44f5719f 100644
--- a/app/models/concerns/compliance_item_support.rb
+++ b/app/models/concerns/compliance_item_support.rb
@@ -10,6 +10,4 @@ module ComplianceItemSupport
     end
   end
 
-  def prerequisite; I18n.t('compliance_controls.metas.no_prerequisite'); end
-
 end