aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers
diff options
context:
space:
mode:
authorRobert2017-10-29 05:28:11 +0100
committerRobert2017-10-31 19:11:05 +0100
commitb1d432628e36d02a23324015f93d4b76a61433e7 (patch)
tree5807ce4323c50c42f9551d9a3de22d951d1152e4 /app/controllers
parent148d05e5c7db7861c167a97d67a6b6da5ea5d9e7 (diff)
downloadchouette-core-b1d432628e36d02a23324015f93d4b76a61433e7.tar.bz2
Refs: #4774@4h; Ransack debugged succesfully
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/compliance_control_sets_controller.rb15
1 files changed, 2 insertions, 13 deletions
diff --git a/app/controllers/compliance_control_sets_controller.rb b/app/controllers/compliance_control_sets_controller.rb
index ac07c5495..b8514e348 100644
--- a/app/controllers/compliance_control_sets_controller.rb
+++ b/app/controllers/compliance_control_sets_controller.rb
@@ -17,26 +17,15 @@ 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 = @compliance_control_set.compliance_controls
- @q_controls_form = @compliance_controls.ransack(params[:q])
@compliance_controls =
- decorate_compliance_controls( @compliance_controls)
+ decorate_compliance_controls( @q_controls_form.result)
.group_by(&:compliance_control_block)
}
end
end
- def simple
- show! do | format |
- format.html do
- @compliance_controls = @compliance_control_set.compliance_controls
- @q_controls_form = @compliance_controls.ransack(params[:q])
- @compliance_control_set = @compliance_control_set.decorate
- end
- end
- end
-
def clone
ComplianceControlSetCloner.new.copy(params[:id], current_organisation.id)
flash[:notice] = I18n.t("compliance_control_sets.errors.operation_in_progress")