Skip to content

Issue 52614: AssertionError deleting site group from its details page #527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-jeckels merged 1 commit into from
Mar 25, 2025
Merged

Issue 52614: AssertionError deleting site group from its details page #527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand All @@ -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)
Expand Down Expand Up @@ -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());
Expand Down
2 changes: 1 addition & 1 deletion panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicSymlinkManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down