From a5594a53736fb80917204d0f2bc56e94ac0994bc Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Mon, 13 Jul 2026 18:10:11 -0700 Subject: [PATCH 1/2] GitHub Issue 1307: Simplify container filtering in GetTransactionRowIdsAction --- audit/src/org/labkey/audit/AuditController.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/audit/src/org/labkey/audit/AuditController.java b/audit/src/org/labkey/audit/AuditController.java index 466f09f9f4d..c0988548e20 100644 --- a/audit/src/org/labkey/audit/AuditController.java +++ b/audit/src/org/labkey/audit/AuditController.java @@ -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-type file imports, 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 @@ -403,7 +405,6 @@ public static class AuditTransactionForm private Long _transactionAuditId; private String _dataType; private boolean _isSampleType; - String _containerFilter; public Long getTransactionAuditId() { @@ -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) From bf75b08116cf565f7049e20f5dc605bcaed98db0 Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Tue, 14 Jul 2026 10:50:11 -0700 Subject: [PATCH 2/2] Fix import type --- audit/src/org/labkey/audit/AuditController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/audit/src/org/labkey/audit/AuditController.java b/audit/src/org/labkey/audit/AuditController.java index c0988548e20..bf30fe7c7e1 100644 --- a/audit/src/org/labkey/audit/AuditController.java +++ b/audit/src/org/labkey/audit/AuditController.java @@ -383,8 +383,8 @@ public Object execute(AuditTransactionForm form, BindException errors) { AuditLogImpl.TransactionRowIds results; User elevatedUser = ElevatedUser.ensureCanSeeAuditLogRole(getContainer(), getUser()); - // Issue 1307: scope strictly to the current container. 26.7 removed cross-type file imports, a transaction's rows live in the same - // container as the transaction + // 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);