Skip to content

Commit 5a27066

Browse files
Issue 48499: Use preferred SecurityPolicyManager.savePolicy() variant (#178)
1 parent 64d899a commit 5a27066

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

mGAP/src/org/labkey/mgap/mGAPController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ public Object execute(ApproveUserRequestsForm form, BindException errors) throws
434434
}
435435
}
436436

437-
SecurityPolicyManager.savePolicy(policy);
437+
SecurityPolicyManager.savePolicy(policy, getUser());
438438

439439
transaction.commit();
440440
}

mcc/src/org/labkey/mcc/MccController.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -572,31 +572,31 @@ public boolean handlePost(Object o, BindException errors) throws Exception
572572
{
573573
MutableSecurityPolicy policy = new MutableSecurityPolicy(requestContainer.getPolicy());
574574
policy.addRoleAssignment(requestGroup, RoleManager.getRole(MccRequesterRole.class));
575-
SecurityPolicyManager.savePolicy(policy);
575+
SecurityPolicyManager.savePolicy(policy, getUser());
576576
}
577577

578578
Group reviewGroup = GroupManager.getGroup(ContainerManager.getRoot(), MccManager.REQUEST_REVIEW_GROUP_NAME, GroupEnumType.SITE);
579579
if (!requestContainer.getPolicy().getAssignedRoles(reviewGroup).contains(RoleManager.getRole(MccRabReviewerRole.class)))
580580
{
581581
MutableSecurityPolicy policy = new MutableSecurityPolicy(requestContainer.getPolicy());
582582
policy.addRoleAssignment(reviewGroup, RoleManager.getRole(MccRabReviewerRole.class));
583-
SecurityPolicyManager.savePolicy(policy);
583+
SecurityPolicyManager.savePolicy(policy, getUser());
584584
}
585585

586586
Group finalGroup = GroupManager.getGroup(ContainerManager.getRoot(), MccManager.FINAL_REVIEW_GROUP_NAME, GroupEnumType.SITE);
587587
if (!requestContainer.getPolicy().getAssignedRoles(finalGroup).contains(RoleManager.getRole(MccFinalReviewerRole.class)))
588588
{
589589
MutableSecurityPolicy policy = new MutableSecurityPolicy(requestContainer.getPolicy());
590590
policy.addRoleAssignment(finalGroup, RoleManager.getRole(MccFinalReviewerRole.class));
591-
SecurityPolicyManager.savePolicy(policy);
591+
SecurityPolicyManager.savePolicy(policy, getUser());
592592
}
593593

594594
Group adminGroup = GroupManager.getGroup(ContainerManager.getRoot(), MccManager.ADMIN_GROUP_NAME, GroupEnumType.SITE);
595595
if (!requestContainer.getPolicy().getAssignedRoles(adminGroup).contains(RoleManager.getRole(MccDataAdminRole.class)))
596596
{
597597
MutableSecurityPolicy policy = new MutableSecurityPolicy(requestContainer.getPolicy());
598598
policy.addRoleAssignment(adminGroup, RoleManager.getRole(MccDataAdminRole.class));
599-
SecurityPolicyManager.savePolicy(policy);
599+
SecurityPolicyManager.savePolicy(policy, getUser());
600600
}
601601
}
602602

@@ -608,7 +608,7 @@ public boolean handlePost(Object o, BindException errors) throws Exception
608608
{
609609
MutableSecurityPolicy policy = new MutableSecurityPolicy(dataContainer.getPolicy());
610610
policy.addRoleAssignment(adminGroup, RoleManager.getRole(MccDataAdminRole.class));
611-
SecurityPolicyManager.savePolicy(policy);
611+
SecurityPolicyManager.savePolicy(policy, getUser());
612612
}
613613
}
614614

0 commit comments

Comments
 (0)