diff --git a/mGAP/src/org/labkey/mgap/mGAPController.java b/mGAP/src/org/labkey/mgap/mGAPController.java index 52991080..0b5378b4 100644 --- a/mGAP/src/org/labkey/mgap/mGAPController.java +++ b/mGAP/src/org/labkey/mgap/mGAPController.java @@ -492,7 +492,7 @@ public Object execute(ApproveUserRequestsForm form, BindException errors) throws Group g = GroupManager.getGroup(mGapContainer, mGAPManager.GROUP_NAME, GroupEnumType.SITE); if (g == null) { - g = SecurityManager.createGroup(ContainerManager.getRoot(), mGAPManager.GROUP_NAME); + g = SecurityManager.createGroup(ContainerManager.getRoot(), mGAPManager.GROUP_NAME, getUser()); } SecurityManager.addMembers(g, allUsers); diff --git a/mGAP/src/org/labkey/mgap/mGapAuditTypeProvider.java b/mGAP/src/org/labkey/mgap/mGapAuditTypeProvider.java index beef576b..95249756 100644 --- a/mGAP/src/org/labkey/mgap/mGapAuditTypeProvider.java +++ b/mGAP/src/org/labkey/mgap/mGapAuditTypeProvider.java @@ -75,7 +75,7 @@ public Class getEventClass() public static void addAuditEntry(Container container, User user, String comment, String type, String releaseVersion) { - mGapAuditTypeProvider.AuditEvent event = new mGapAuditTypeProvider.AuditEvent(container.getId(), comment); + mGapAuditTypeProvider.AuditEvent event = new mGapAuditTypeProvider.AuditEvent(container, comment); event.setType(type); event.setReleaseVersion(releaseVersion); @@ -93,7 +93,7 @@ public AuditEvent() super(); } - public AuditEvent(String container, String comment) + public AuditEvent(Container container, String comment) { super(AUDIT_EVENT_TYPE, container, comment); } diff --git a/mcc/src/org/labkey/mcc/MccController.java b/mcc/src/org/labkey/mcc/MccController.java index f5df6b5e..9eede3c1 100644 --- a/mcc/src/org/labkey/mcc/MccController.java +++ b/mcc/src/org/labkey/mcc/MccController.java @@ -423,13 +423,13 @@ public Object execute(ApproveUserRequestsForm form, BindException errors) throws Group g1 = GroupManager.getGroup(mccContainer, MccManager.MCC_GROUP_NAME, GroupEnumType.SITE); if (g1 == null) { - g1 = SecurityManager.createGroup(ContainerManager.getRoot(), MccManager.MCC_GROUP_NAME); + g1 = SecurityManager.createGroup(ContainerManager.getRoot(), MccManager.MCC_GROUP_NAME, getUser()); } Group g2 = GroupManager.getGroup(mccContainer, MccManager.REQUEST_GROUP_NAME, GroupEnumType.SITE); if (g2 == null) { - g2 = SecurityManager.createGroup(ContainerManager.getRoot(), MccManager.REQUEST_GROUP_NAME); + g2 = SecurityManager.createGroup(ContainerManager.getRoot(), MccManager.REQUEST_GROUP_NAME, getUser()); } SecurityManager.addMembers(g1, allUsers); @@ -576,7 +576,7 @@ public boolean handlePost(Object o, BindException errors) throws Exception Group g1 = GroupManager.getGroup(ContainerManager.getRoot(), gn, GroupEnumType.SITE); if (g1 == null) { - SecurityManager.createGroup(ContainerManager.getRoot(), gn); + SecurityManager.createGroup(ContainerManager.getRoot(), gn, getUser()); } }