From eed6b9b3241fb6d2573d5c4b2c980bd4ae3d376b Mon Sep 17 00:00:00 2001 From: XingY Date: Mon, 25 Aug 2025 10:57:30 -0700 Subject: [PATCH 1/3] Fix EHR --- ehr/api-src/org/labkey/api/ehr/SharedEHRUpgradeCode.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ehr/api-src/org/labkey/api/ehr/SharedEHRUpgradeCode.java b/ehr/api-src/org/labkey/api/ehr/SharedEHRUpgradeCode.java index a4c0873a8..99632bdf6 100644 --- a/ehr/api-src/org/labkey/api/ehr/SharedEHRUpgradeCode.java +++ b/ehr/api-src/org/labkey/api/ehr/SharedEHRUpgradeCode.java @@ -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); From 8d1b38ae5195164812ef3bfe76dfabd5a9aec88f Mon Sep 17 00:00:00 2001 From: XingY Date: Mon, 25 Aug 2025 11:14:09 -0700 Subject: [PATCH 2/3] Fix EHR --- ehr/src/org/labkey/ehr/EHRController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ehr/src/org/labkey/ehr/EHRController.java b/ehr/src/org/labkey/ehr/EHRController.java index 769daab4c..c1e2adaec 100644 --- a/ehr/src/org/labkey/ehr/EHRController.java +++ b/ehr/src/org/labkey/ehr/EHRController.java @@ -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); From fd51d3720772c8c9694b8a4af3006bd85a05d52e Mon Sep 17 00:00:00 2001 From: XingY Date: Mon, 25 Aug 2025 11:15:56 -0700 Subject: [PATCH 3/3] Fix EHR --- ehr/src/org/labkey/ehr/EHRController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ehr/src/org/labkey/ehr/EHRController.java b/ehr/src/org/labkey/ehr/EHRController.java index c1e2adaec..74abb2b5e 100644 --- a/ehr/src/org/labkey/ehr/EHRController.java +++ b/ehr/src/org/labkey/ehr/EHRController.java @@ -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);