diff --git a/audit/src/org/labkey/audit/AuditController.java b/audit/src/org/labkey/audit/AuditController.java index 466f09f9f4d..bf30fe7c7e1 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-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 @@ -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)