Skip to content

Use EffectiveAuditBehavior #1021

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
XingY merged 3 commits into from
Aug 29, 2025
Merged

Use EffectiveAuditBehavior #1021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eed6b9b
Fix EHR
XingY Aug 25, 2025
8d1b38a
Fix EHR
XingY Aug 25, 2025
fd51d37
Fix EHR
XingY Aug 25, 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
2 changes: 1 addition & 1 deletion ehr/api-src/org/labkey/api/ehr/SharedEHRUpgradeCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ private void importFile(TsvImport tsvImport, Container container, User user) thr
updateService.truncateRows(user, container, null, null);

BatchValidationException errors = new BatchValidationException();
AuditBehaviorType behaviorType = table.getAuditBehavior();
AuditBehaviorType behaviorType = table.getEffectiveAuditBehavior();
TransactionAuditProvider.TransactionAuditEvent auditEvent = null;
if (behaviorType != null && behaviorType != AuditBehaviorType.NONE)
auditEvent = createTransactionAuditEvent(container, QueryService.AuditAction.INSERT);
Expand Down
4 changes: 2 additions & 2 deletions ehr/src/org/labkey/ehr/EHRController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1499,7 +1499,7 @@ private void loadFile(UserSchema schema, String tableName, Resource resource, bo
DataLoader loader = DataLoader.get().createLoader(resource, true, null, TabLoader.TSV_FILE_TYPE);

BatchValidationException batchErrors = new BatchValidationException();
AuditBehaviorType behaviorType = table.getAuditBehavior();
AuditBehaviorType behaviorType = table.getEffectiveAuditBehavior();
TransactionAuditProvider.TransactionAuditEvent auditEvent = null;
if (behaviorType != null && behaviorType != AuditBehaviorType.NONE)
auditEvent = createTransactionAuditEvent(getContainer(), QueryService.AuditAction.INSERT);
Expand Down Expand Up @@ -1668,7 +1668,7 @@ public Object execute(PopulateLookupsForm form, BindException errors) throws Exc
DataLoader loader = DataLoader.get().createLoader(_reportsResource, true, null, TabLoader.TSV_FILE_TYPE);

BatchValidationException batchErrors = new BatchValidationException();
AuditBehaviorType behaviorType = table.getAuditBehavior();
AuditBehaviorType behaviorType = table.getEffectiveAuditBehavior();
TransactionAuditProvider.TransactionAuditEvent auditEvent = null;
if (behaviorType != null && behaviorType != AuditBehaviorType.NONE)
auditEvent = createTransactionAuditEvent(getContainer(), QueryService.AuditAction.INSERT);
Expand Down