Use EffectiveAuditBehavior (#1021)

Author: XingY

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);

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);
@@ -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);