Skip to content

GitHub Issue 1307: Simplify container filtering in GetTransactionRowIdsAction #7841

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

Open
labkey-jeckels wants to merge 2 commits into
base: release26.7-SNAPSHOT
Choose a base branch
from
+3 −12
Open

GitHub Issue 1307: Simplify container filtering in GetTransactionRowIdsAction #7841

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5594a5
GitHub Issue 1307: Simplify container filtering in GetTransactionRowI…
labkey-jeckels Jul 14, 2026
bf75b08
Fix import type
labkey-jeckels Jul 14, 2026
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
15 changes: 3 additions & 12 deletions audit/src/org/labkey/audit/AuditController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,9 @@ public Object execute(AuditTransactionForm form, BindException errors)
{
AuditLogImpl.TransactionRowIds results;
User elevatedUser = ElevatedUser.ensureCanSeeAuditLogRole(getContainer(), getUser());
ContainerFilter cf = ContainerFilter.getContainerFilterByName(form.getContainerFilter(), getContainer(), elevatedUser);
// Issue 1307: scope strictly to the current container. 26.7 removed cross-folder imports, so a
// transaction's rows live in the same container as the transaction
ContainerFilter cf = ContainerFilter.Type.Current.create(getContainer(), elevatedUser);
if (form.isSampleType())
results = AuditLogImpl.get().getTransactionSampleIds(form.getTransactionAuditId(), elevatedUser, getContainer(), cf);
else
Expand All @@ -403,7 +405,6 @@ public static class AuditTransactionForm
private Long _transactionAuditId;
private String _dataType;
private boolean _isSampleType;
String _containerFilter;

public Long getTransactionAuditId()
{
Expand All @@ -430,16 +431,6 @@ public boolean isSampleType()
return _isSampleType;
}

public String getContainerFilter()
{
return _containerFilter;
}

public void setContainerFilter(String containerFilter)
{
_containerFilter = containerFilter;
}

public void validate(Errors errors)
{
if (getTransactionAuditId() == null)
Expand Down