Skip to content

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

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

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

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
891f0bd
Issue 52614: AssertionError deleting site group from its details page
labkey-jeckels Mar 21, 2025
c05089d
Merge branch 'refs/heads/develop' into fb_52614_groupAuditing
labkey-jeckels Mar 24, 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
3 changes: 2 additions & 1 deletion flow/src/org/labkey/flow/persist/FlowKeywordAuditProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.labkey.api.audit.AuditTypeProvider;
import org.labkey.api.audit.query.AbstractAuditDomainKind;
import org.labkey.api.audit.query.DefaultAuditTypeTable;
import org.labkey.api.data.Container;
import org.labkey.api.data.ContainerFilter;
import org.labkey.api.data.TableInfo;
import org.labkey.api.exp.PropertyDescriptor;
Expand Down Expand Up @@ -133,7 +134,7 @@ public FlowKeywordAuditEvent()
super();
}

public FlowKeywordAuditEvent(String container, String comment)
public FlowKeywordAuditEvent(Container container, String comment)
{
super(EVENT_TYPE, container, comment);
}
Expand Down
2 changes: 1 addition & 1 deletion flow/src/org/labkey/flow/persist/FlowManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1232,7 +1232,7 @@ public void setKeyword(Container c, User user, ExpData data, String keyword, Str
private void addKeywordAuditEvent(Container c, User user, String keyword, String newValue, String oldValue, String fileName, String lsid)
{

FlowKeywordAuditProvider.FlowKeywordAuditEvent event = new FlowKeywordAuditProvider.FlowKeywordAuditEvent(c.getId(),"keyword");
FlowKeywordAuditProvider.FlowKeywordAuditEvent event = new FlowKeywordAuditProvider.FlowKeywordAuditEvent(c,"keyword");
event.setKeywordName(keyword);
event.setOldValue(oldValue);
event.setNewValue(newValue);
Expand Down