Skip to content

Switch to opt-in for useTransactionAuditCache #7909

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
XingY wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

Switch to opt-in for useTransactionAuditCache #7909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ff4d04e
Pass useTransactionAuditCache in extraScriptContext for async import
XingY Aug 4, 2026
77c11b6
CRLF
XingY Aug 4, 2026
ed98fd7
Switch to opt-in for useTransactionAuditCache
XingY Aug 4, 2026
6930075
Merge remote-tracking branch 'origin/develop' into fb_issue1323
XingY Aug 6, 2026
409b494
Merge remote-tracking branch 'origin/develop' into fb_issue1323
XingY Aug 7, 2026
015f1d2
Allow cross folder transaction audit events
XingY Aug 7, 2026
7722dc6
crlf
XingY Aug 10, 2026
3177171
Merge remote-tracking branch 'origin/develop' into fb_issue1323
XingY Aug 10, 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
5 changes: 2 additions & 3 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,9 +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-folder imports, so a
// transaction's rows live in the same container as the transaction
ContainerFilter cf = ContainerFilter.Type.Current.create(getContainer(), elevatedUser);
// GitHub Issue 1307: use product folder data CF
ContainerFilter cf = getContainer().getProductFoldersDataContainerFilter(elevatedUser);
if (form.isSampleType())
results = AuditLogImpl.get().getTransactionSampleIds(form.getTransactionAuditId(), elevatedUser, getContainer(), cf);
else
Expand Down
5 changes: 1 addition & 4 deletions experiment/src/org/labkey/experiment/ExpDataIterators.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2373,10 +2373,7 @@ public DataIterator getDataIterator(DataIteratorContext context)

// useTransactionAuditCache already set for import and merge in AbstractQueryImportAction.createDataIteratorContext
if (context.getInsertOption() == QueryUpdateService.InsertOption.INSERT)
{
if (Boolean.FALSE != context.getConfigParameter(AbstractQueryImportAction.Params.useTransactionAuditCache))
context.setUseTransactionAuditCache(true);
}
context.setUseTransactionAuditCache(context.getConfigParameterBoolean(AbstractQueryImportAction.Params.useTransactionAuditCache));

// add FileLink DataIterator if any input columns are of type FILE_LINK
if (null != _fileLinkDirectory)
Expand Down