Use the proper container for setting and retrieving the audit settings

LabKey · Jan 24, 2024 · cee5768 · cee5768
1 parent 8dbf05d
commit cee5768
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/audit/src/org/labkey/audit/AuditController.java b/audit/src/org/labkey/audit/AuditController.java
@@ -67,6 +67,7 @@
 import java.io.PrintWriter;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.List;
@@ -527,12 +528,14 @@ public static class SaveAuditSettingsAction extends MutatingApiAction<AuditSetti
         @Override
         public void validateForm(AuditSettingsForm form, Errors errors)
         {
+            if (!getContainer().isAppHomeFolder())
+                errors.reject(ERROR_GENERIC, "This action is not supported for sub-folders of the application.");
             if (form.getRequireUserComments() == null)
                 errors.reject(ERROR_REQUIRED, "requireUserComments is required to be non-null.");
         }
 
         @Override
-        public Object execute(AuditSettingsForm form, BindException errors) throws Exception
+        public Object execute(AuditSettingsForm form, BindException errors)
         {
             ContainerManager.setRequireAuditComments(getContainer(), getUser(), form.getRequireUserComments());
             return success();
@@ -558,9 +561,12 @@ public void setRequireUserComments(Boolean requireUserComments)
     public static class GetAuditSettingsAction extends ReadOnlyApiAction<Object>
     {
         @Override
-        public Object execute(Object o, BindException errors) throws Exception
+        public Object execute(Object o, BindException errors)
         {
-            return Map.of(REQUIRE_USER_COMMENTS_PROPERTY_NAME, getContainer().getAuditCommentsRequired());
+            Container container = getContainer();
+            if (!container.isAppHomeFolder())
+                container = container.getProject();
+            return container == null ? Collections.emptyMap() : Map.of(REQUIRE_USER_COMMENTS_PROPERTY_NAME, container.getAuditCommentsRequired());
         }
     }
 }