Showing ComplianceCheck RuleParameterSet

2 files changed, 5 insertions, 4 deletions

diff --git a/app/controllers/compliance_check_results_controller.rb b/app/controllers/compliance_check_results_controller.rb
index b1f31844a..3195e4c82 100644
--- a/app/controllers/compliance_check_results_controller.rb
+++ b/app/controllers/compliance_check_results_controller.rb
@@ -22,12 +22,12 @@ class ComplianceCheckResultsController < ChouetteController
     @compliance_check ||= compliance_check_service.find( params[:compliance_check_id] )
   end
   
-  def compliance_check_result
-    @compliance_check_result ||= compliance_check.compliance_check_result
+  def compliance_check_validation_report
+    @compliance_check_validation_report ||= compliance_check.compliance_check_validation_report
   end
   
   def collection
-    @compliance_check_results ||= compliance_check_result.all(params[:status], params[:severity]) #.paginate(:page => params[:page])
+    @compliance_check_validation_reports ||= compliance_check_validation_report.all(params[:status], params[:severity]) #.paginate(:page => params[:page])
   end
   
   def rule_parameter_set
diff --git a/app/controllers/compliance_checks_controller.rb b/app/controllers/compliance_checks_controller.rb
index 268c1f354..3ce961d72 100644
--- a/app/controllers/compliance_checks_controller.rb
+++ b/app/controllers/compliance_checks_controller.rb
@@ -29,7 +29,8 @@ class ComplianceChecksController < ChouetteController
   end
 
   def rule_parameter_set
-    @rule_parameter_set = compliance_check.rule_parameter_set_archived
+    #@rule_parameter_set = compliance_check.rule_parameter_set_archived
+    @rule_parameter_set = resource.rule_parameter_set
     build_breadcrumb :edit
     render "rule_parameter_sets/show"
   end