Skip to content

Commit ed84141

Browse files
Issue 52614: AssertionError deleting site group from its details page (#527)
1 parent 75aa5ac commit ed84141

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicController.java

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -441,8 +441,7 @@ else if(error.length() > 0)
441441
Portal.saveParts(container, Portal.DEFAULT_PORTAL_PAGE_ID, newWebParts); // this will remove the TARGETED_MS_SETUP
442442

443443
// Add the permissions group
444-
Group group = SecurityManager.createGroup(container, form.getGroupName());
445-
writeToAuditLog(group);
444+
Group group = SecurityManager.createGroup(container, form.getGroupName(), getUser());
446445

447446
// Assign project admin role to the group.
448447
MutableSecurityPolicy policy = new MutableSecurityPolicy(SecurityPolicyManager.getPolicy(container));
@@ -462,13 +461,6 @@ else if(error.length() > 0)
462461
return true;
463462
}
464463

465-
private void writeToAuditLog(Group newGroup)
466-
{
467-
GroupAuditProvider.GroupAuditEvent event = new GroupAuditProvider.GroupAuditEvent(getContainer().getId(), "A new security group named " + newGroup.getName() + " was created by the " + PanoramaPublicModule.NAME + " module.");
468-
event.setGroup(newGroup.getUserId());
469-
AuditLogService.get().addEvent(getUser(), event);
470-
}
471-
472464
@Override
473465
public URLHelper getSuccessURL(CreateJournalGroupForm newJournalGroupForm)
474466
{ if(_journal != null)
@@ -564,7 +556,7 @@ public boolean handlePost(JournalForm form, BindException errors)
564556
JournalManager.delete(journal, getUser());
565557

566558
// Delete the permissions group created for this journal.
567-
SecurityManager.deleteGroup(SecurityManager.getGroup(journal.getLabkeyGroupId()));
559+
SecurityManager.deleteGroup(SecurityManager.getGroup(journal.getLabkeyGroupId()), getUser());
568560

569561
// Delete the project created for this journal.
570562
ContainerManager.delete(journal.getProject(), getUser());

panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicSymlinkManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ private void addReplaceTargetWithSymlinkAuditEvent(Path link, Path target, Conta
274274
private void addFileAuditEvent(Path link, Container container, User user, String comment)
275275
{
276276
FileSystemAuditProvider.FileSystemAuditEvent event = new FileSystemAuditProvider.FileSystemAuditEvent(
277-
container != null ? container.getId() : null, comment);
277+
container != null ? container : null, comment);
278278
event.setFile(link.getFileName().toString());
279279
event.setDirectory(link.getParent().toString());
280280
AuditLogService.get().addEvent(user, event);

0 commit comments

Comments
 (0)