From 2d2159c310ed2b2be5f2be0181683cf93345be7a Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Fri, 21 Mar 2025 14:42:01 -0700 Subject: [PATCH 1/2] Issue 52614: AssertionError deleting site group from its details page --- mGAP/src/org/labkey/mgap/mGAPController.java | 2 +- mGAP/src/org/labkey/mgap/mGapAuditTypeProvider.java | 4 ++-- mcc/src/org/labkey/mcc/MccController.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mGAP/src/org/labkey/mgap/mGAPController.java b/mGAP/src/org/labkey/mgap/mGAPController.java index 52991080b..0b5378b4f 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 beef576bb..952497568 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 f5df6b5ec..3045e92ef 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); From c0874d2470fe22eb767d8934dcc2172425b86df1 Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Sun, 23 Mar 2025 14:33:08 -0700 Subject: [PATCH 2/2] Issue 52614: AssertionError deleting site group from its details page --- mcc/src/org/labkey/mcc/MccController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mcc/src/org/labkey/mcc/MccController.java b/mcc/src/org/labkey/mcc/MccController.java index 3045e92ef..9eede3c1a 100644 --- a/mcc/src/org/labkey/mcc/MccController.java +++ b/mcc/src/org/labkey/mcc/MccController.java @@ -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()); } }