Skip to content

Commit 35fd022

Browse files
Improve audit log API (#245)
* Issue 52614: AssertionError deleting site group from its details page * Issue 52614: AssertionError deleting site group from its details page
1 parent 775c549 commit 35fd022

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

mGAP/src/org/labkey/mgap/mGAPController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ public Object execute(ApproveUserRequestsForm form, BindException errors) throws
492492
Group g = GroupManager.getGroup(mGapContainer, mGAPManager.GROUP_NAME, GroupEnumType.SITE);
493493
if (g == null)
494494
{
495-
g = SecurityManager.createGroup(ContainerManager.getRoot(), mGAPManager.GROUP_NAME);
495+
g = SecurityManager.createGroup(ContainerManager.getRoot(), mGAPManager.GROUP_NAME, getUser());
496496
}
497497

498498
SecurityManager.addMembers(g, allUsers);

mGAP/src/org/labkey/mgap/mGapAuditTypeProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public <K extends AuditTypeEvent> Class<K> getEventClass()
7575

7676
public static void addAuditEntry(Container container, User user, String comment, String type, String releaseVersion)
7777
{
78-
mGapAuditTypeProvider.AuditEvent event = new mGapAuditTypeProvider.AuditEvent(container.getId(), comment);
78+
mGapAuditTypeProvider.AuditEvent event = new mGapAuditTypeProvider.AuditEvent(container, comment);
7979

8080
event.setType(type);
8181
event.setReleaseVersion(releaseVersion);
@@ -93,7 +93,7 @@ public AuditEvent()
9393
super();
9494
}
9595

96-
public AuditEvent(String container, String comment)
96+
public AuditEvent(Container container, String comment)
9797
{
9898
super(AUDIT_EVENT_TYPE, container, comment);
9999
}

mcc/src/org/labkey/mcc/MccController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -423,13 +423,13 @@ public Object execute(ApproveUserRequestsForm form, BindException errors) throws
423423
Group g1 = GroupManager.getGroup(mccContainer, MccManager.MCC_GROUP_NAME, GroupEnumType.SITE);
424424
if (g1 == null)
425425
{
426-
g1 = SecurityManager.createGroup(ContainerManager.getRoot(), MccManager.MCC_GROUP_NAME);
426+
g1 = SecurityManager.createGroup(ContainerManager.getRoot(), MccManager.MCC_GROUP_NAME, getUser());
427427
}
428428

429429
Group g2 = GroupManager.getGroup(mccContainer, MccManager.REQUEST_GROUP_NAME, GroupEnumType.SITE);
430430
if (g2 == null)
431431
{
432-
g2 = SecurityManager.createGroup(ContainerManager.getRoot(), MccManager.REQUEST_GROUP_NAME);
432+
g2 = SecurityManager.createGroup(ContainerManager.getRoot(), MccManager.REQUEST_GROUP_NAME, getUser());
433433
}
434434

435435
SecurityManager.addMembers(g1, allUsers);
@@ -576,7 +576,7 @@ public boolean handlePost(Object o, BindException errors) throws Exception
576576
Group g1 = GroupManager.getGroup(ContainerManager.getRoot(), gn, GroupEnumType.SITE);
577577
if (g1 == null)
578578
{
579-
SecurityManager.createGroup(ContainerManager.getRoot(), gn);
579+
SecurityManager.createGroup(ContainerManager.getRoot(), gn, getUser());
580580
}
581581
}
582582

0 commit comments

Comments
 (0)