Refs: #4823@0.3h; Code Review Part III

4 files changed, 20 insertions, 19 deletions

diff --git a/app/controllers/compliance_check_sets_controller.rb b/app/controllers/compliance_check_sets_controller.rb
index 5f392ef82..175c22191 100644
--- a/app/controllers/compliance_check_sets_controller.rb
+++ b/app/controllers/compliance_check_sets_controller.rb
@@ -20,7 +20,10 @@ class ComplianceCheckSetsController < InheritedResources::Base
   end
 
   def executed
-    show!(&method(:implement_executed))
+    show! do |format| 
+      # But now nobody is aware anymore that `format.html` passes a parameter into the block
+      format.html { executed_for_html }
+    end 
   end
 
 
@@ -28,17 +31,15 @@ class ComplianceCheckSetsController < InheritedResources::Base
 
   # Action Implementation
   # ---------------------
-  def implement_executed format
-    format.html(&method(:implement_executed_for_html))
-  end
 
-  def implement_executed_for_html _mime_response
+  def executed_for_html
     @q_checks_form        = @compliance_check_set.compliance_checks.ransack(params[:q])
     @compliance_check_set = @compliance_check_set.decorate
-    @compliance_checks    =
+    compliance_checks    =
       decorate_compliance_checks( @q_checks_form.result)
         .group_by(&:compliance_check_block)
-    @direct_compliance_checks = @compliance_checks.delete nil
+    @direct_compliance_checks        = compliance_checks.delete nil
+    @blocks_to_compliance_checks_map = compliance_checks
   end
 
   # Decoration
diff --git a/app/controllers/compliance_control_sets_controller.rb b/app/controllers/compliance_control_sets_controller.rb
index 65aa1e81f..83a345c6f 100644
--- a/app/controllers/compliance_control_sets_controller.rb
+++ b/app/controllers/compliance_control_sets_controller.rb
@@ -16,7 +16,10 @@ class ComplianceControlSetsController < InheritedResources::Base
   end
 
   def show
-    show!(&method(:implement_show))
+    show! do |format|
+      # But now nobody is aware anymore that `format.html` passes a parameter into the block
+      format.html { show_for_html }
+    end
   end
 
 
@@ -52,16 +55,13 @@ class ComplianceControlSetsController < InheritedResources::Base
     params.require(:compliance_control_set).permit(:name, :id)
   end
 
-  def implement_show format
-    format.html(&method(:implement_show_for_html))
-  end
-
-  def implement_show_for_html _mime_response
+  def show_for_html
     @q_controls_form        = @compliance_control_set.compliance_controls.ransack(params[:q])
     @compliance_control_set = @compliance_control_set.decorate
-    @compliance_controls    =
+    compliance_controls    =
       decorate_compliance_controls( @q_controls_form.result)
       .group_by(&:compliance_control_block)
-    @direct_compliance_controls = @compliance_controls.delete nil
+    @direct_compliance_controls        = compliance_controls.delete nil
+    @blocks_to_compliance_controls_map = compliance_controls
   end
 end
diff --git a/app/views/compliance_check_sets/executed.html.slim b/app/views/compliance_check_sets/executed.html.slim
index 84601e17c..8afb1d545 100644
--- a/app/views/compliance_check_sets/executed.html.slim
+++ b/app/views/compliance_check_sets/executed.html.slim
@@ -11,7 +11,7 @@
         = definition_list t('metadatas'),
             ComplianceCheckSet.human_attribute_name(:name) => @compliance_check_set.name
 
-  - if params[:q].present? || @compliance_checks.any? || @direct_compliance_checks
+  - if params[:q].present? || @blocks_to_compliance_checks_map.any? || @direct_compliance_checks
     .row
       .col-lg-12
         h2
@@ -50,7 +50,7 @@
                 cls: 'table has-filter has-search',
                 model: ComplianceCheck
                 
-    - @compliance_checks.each do |block, compliance_checks|
+    - @blocks_to_compliance_checks_map.each do |block, compliance_checks|
 
       - if compliance_checks.try(:any?)
         .row
diff --git a/app/views/compliance_control_sets/show.html.slim b/app/views/compliance_control_sets/show.html.slim
index 12be42ea6..e152c189f 100644
--- a/app/views/compliance_control_sets/show.html.slim
+++ b/app/views/compliance_control_sets/show.html.slim
@@ -26,7 +26,7 @@
             ComplianceControlSet.human_attribute_name(:name) => @compliance_control_set.name,
             I18n.t('activerecord.attributes.compliance_control_set.owner_jdc') => @compliance_control_set.organisation.name
 
-  - if params[:q].present? || @compliance_controls.any? || @direct_compliance_controls
+  - if params[:q].present? || @blocks_to_compliance_controls_map.any? || @direct_compliance_controls
     .row
       .col-lg-12
         = render '/compliance_controls/filters'
@@ -66,7 +66,7 @@
                 cls: 'table has-filter has-search',
                 model: ComplianceControl
 
-    - @compliance_controls.each do |block, compliance_controls|
+    - @blocks_to_compliance_controls_map.each do |block, compliance_controls|
 
       - if compliance_controls.try(:any?)
         .row