From e96fe6b77b9d89e8f7d176c5b9fb8a75b7a5c0e3 Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Fri, 21 Mar 2025 14:07:39 -0700 Subject: [PATCH] Issue 52614: AssertionError deleting site group from its details page --- .../panoramapublic/PanoramaPublicController.java | 12 ++---------- .../panoramapublic/PanoramaPublicSymlinkManager.java | 2 +- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicController.java b/panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicController.java index 6a15fcc6..dda469ba 100644 --- a/panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicController.java +++ b/panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicController.java @@ -441,8 +441,7 @@ else if(error.length() > 0) Portal.saveParts(container, Portal.DEFAULT_PORTAL_PAGE_ID, newWebParts); // this will remove the TARGETED_MS_SETUP // Add the permissions group - Group group = SecurityManager.createGroup(container, form.getGroupName()); - writeToAuditLog(group); + Group group = SecurityManager.createGroup(container, form.getGroupName(), getUser()); // Assign project admin role to the group. MutableSecurityPolicy policy = new MutableSecurityPolicy(SecurityPolicyManager.getPolicy(container)); @@ -462,13 +461,6 @@ else if(error.length() > 0) return true; } - private void writeToAuditLog(Group newGroup) - { - GroupAuditProvider.GroupAuditEvent event = new GroupAuditProvider.GroupAuditEvent(getContainer().getId(), "A new security group named " + newGroup.getName() + " was created by the " + PanoramaPublicModule.NAME + " module."); - event.setGroup(newGroup.getUserId()); - AuditLogService.get().addEvent(getUser(), event); - } - @Override public URLHelper getSuccessURL(CreateJournalGroupForm newJournalGroupForm) { if(_journal != null) @@ -564,7 +556,7 @@ public boolean handlePost(JournalForm form, BindException errors) JournalManager.delete(journal, getUser()); // Delete the permissions group created for this journal. - SecurityManager.deleteGroup(SecurityManager.getGroup(journal.getLabkeyGroupId())); + SecurityManager.deleteGroup(SecurityManager.getGroup(journal.getLabkeyGroupId()), getUser()); // Delete the project created for this journal. ContainerManager.delete(journal.getProject(), getUser()); diff --git a/panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicSymlinkManager.java b/panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicSymlinkManager.java index 3379f770..43d9eada 100644 --- a/panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicSymlinkManager.java +++ b/panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicSymlinkManager.java @@ -274,7 +274,7 @@ private void addReplaceTargetWithSymlinkAuditEvent(Path link, Path target, Conta private void addFileAuditEvent(Path link, Container container, User user, String comment) { FileSystemAuditProvider.FileSystemAuditEvent event = new FileSystemAuditProvider.FileSystemAuditEvent( - container != null ? container.getId() : null, comment); + container != null ? container : null, comment); event.setFile(link.getFileName().toString()); event.setDirectory(link.getParent().toString()); AuditLogService.get().addEvent(user, event);