diff options
| author | Alban Peignier | 2018-05-09 15:53:44 +0200 |
|---|---|---|
| committer | Alban Peignier | 2018-05-09 15:53:44 +0200 |
| commit | 7107266518c028bebea7e4a89fd1db1040935b35 (patch) | |
| tree | 77ea7d1eb966fca197b1074b4f4f22ef44f69212 /app/controllers | |
| parent | d0ab0eb848a96587ac0e0ab26db962c15e559185 (diff) | |
| download | chouette-core-7107266518c028bebea7e4a89fd1db1040935b35.tar.bz2 | |
Use Workbench#compliance_control_set_ids virtual attribute to merge with existing owner_compliance_control_set_ids. Refs #6960
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/workbenches_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/workgroups_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/workbenches_controller.rb b/app/controllers/workbenches_controller.rb index 1432518dc..d4dfdebe3 100644 --- a/app/controllers/workbenches_controller.rb +++ b/app/controllers/workbenches_controller.rb @@ -42,7 +42,7 @@ class WorkbenchesController < ChouetteController private def workbench_params - params.require(:workbench).permit(owner_compliance_control_set_ids: @workbench.workgroup.compliance_control_sets_by_workbench.keys) + params.require(:workbench).permit(compliance_control_set_ids: @workbench.workgroup.compliance_control_sets_by_workbench.keys) end def resource diff --git a/app/controllers/workgroups_controller.rb b/app/controllers/workgroups_controller.rb index 70aa89cf9..3acea248d 100644 --- a/app/controllers/workgroups_controller.rb +++ b/app/controllers/workgroups_controller.rb @@ -8,6 +8,6 @@ class WorkgroupsController < ChouetteController end def workgroup_params - params[:workgroup].permit(workbenches_attributes: [:id, owner_compliance_control_set_ids: @workgroup.compliance_control_sets_by_workgroup.keys]) + params[:workgroup].permit(workbenches_attributes: [:id, compliance_control_set_ids: @workgroup.compliance_control_sets_by_workgroup.keys]) end end |