Skip to content

Improve audit log API #245

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 2 commits into from
Mar 25, 2025
Merged

Improve audit log API #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d2159c
Issue 52614: AssertionError deleting site group from its details page
labkey-jeckels Mar 21, 2025
c0874d2
Issue 52614: AssertionError deleting site group from its details page
labkey-jeckels Mar 23, 2025
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
2 changes: 1 addition & 1 deletion mGAP/src/org/labkey/mgap/mGAPController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions mGAP/src/org/labkey/mgap/mGapAuditTypeProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public <K extends AuditTypeEvent> Class<K> 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);
Expand All @@ -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);
}
Expand Down
6 changes: 3 additions & 3 deletions mcc/src/org/labkey/mcc/MccController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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());
}
}

Expand Down