Merge branch 'master' into 4755-page_for_validate_referential

2 files changed, 6 insertions, 3 deletions

diff --git a/app/controllers/compliance_control_sets_controller.rb b/app/controllers/compliance_control_sets_controller.rb
index f6002956b..cff67d5cb 100644
--- a/app/controllers/compliance_control_sets_controller.rb
+++ b/app/controllers/compliance_control_sets_controller.rb
@@ -17,8 +17,12 @@ class ComplianceControlSetsController < InheritedResources::Base
   def show
     show! do |format|
       format.html {
+        @q_controls_form        = @compliance_control_set.compliance_controls.ransack(params[:q])
         @compliance_control_set = @compliance_control_set.decorate
-        @compliance_controls_without_block = decorate_compliance_controls(@compliance_control_set.compliance_controls.where(compliance_control_block_id: nil))
+        @compliance_controls    =
+          decorate_compliance_controls( @q_controls_form.result)
+            .group_by(&:compliance_control_block)
+        @indirect_compliance_controls = @compliance_controls.delete nil
       }
     end
   end
@@ -58,4 +62,4 @@ class ComplianceControlSetsController < InheritedResources::Base
   def compliance_control_set_params
     params.require(:compliance_control_set).permit(:name, :id)
   end
-end
\ No newline at end of file
+end
diff --git a/app/controllers/stop_areas_controller.rb b/app/controllers/stop_areas_controller.rb
index 0c9f3067a..1d6f88068 100644
--- a/app/controllers/stop_areas_controller.rb
+++ b/app/controllers/stop_areas_controller.rb
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 class StopAreasController < InheritedResources::Base
   include ApplicationHelper