Merge 23.7 to develop

Author: labkey-teamcity

ehr/api-src/org/labkey/api/ehr/SharedEHRUpgradeCode.java

@@ -115,15 +115,23 @@ public void fallthroughHandler(String methodName)
         else if (methodName.startsWith(IMPORT_FROM_TSV_PREFIX))
         {
             String[] tsvArguments = methodName.split(";");
-            if (tsvArguments.length != 4)
+            if (tsvArguments.length < 4 || tsvArguments.length > 5)
             {
-                throw new UnsupportedOperationException("Expected three arguments for importFromTsv but got " + (tsvArguments.length - 1));
+                throw new UnsupportedOperationException("Expected three or four arguments for importFromTsv but got " + (tsvArguments.length - 1));
             }
             String schemaName = tsvArguments[1];
             String queryName = tsvArguments[2];
             String tsvPath = tsvArguments[3];
 
-            _tsvImports.add(new TsvImport(schemaName, queryName, tsvPath));
+            if (tsvArguments.length == 5)
+            {
+                String containerPath = tsvArguments[4];
+                _tsvImports.add(new TsvImport(schemaName, queryName, tsvPath, containerPath));
+            }
+            else
+            {
+                _tsvImports.add(new TsvImport(schemaName, queryName, tsvPath));
+            }
         }
         else if (methodName.startsWith(IMPORT_DOMAIN_TEMPLATE))
         {
@@ -216,7 +224,23 @@ public void moduleStartupComplete(ServletContext servletContext)
             {
                 for (TsvImport tsvImport : _tsvImports)
                 {
-                    importFile(tsvImport, container, user);
+                    if (tsvImport._containerPath != null)
+                    {
+                        Container tsvImportContainer = ContainerManager.getForPath(tsvImport._containerPath);
+                        if (tsvImportContainer != null)
+                        {
+                            importFile(tsvImport, tsvImportContainer, user);
+                        }
+                        else
+                        {
+                            LOG.warn("Unable to find container for path " + tsvImport._containerPath + ". Importing into EHR study container.");
+                            importFile(tsvImport, container, user);
+                        }
+                    }
+                    else
+                    {
+                        importFile(tsvImport, container, user);
+                    }
                 }
 
                 if (_reloadFolder)
@@ -308,6 +332,7 @@ private static class TsvImport
         private final String _schemaName;
         private final String _queryName;
         private final String _tsvPath;
+        private String _containerPath;
 
         public TsvImport(String schemaName, String queryName, String tsvPath)
         {
@@ -316,6 +341,12 @@ public TsvImport(String schemaName, String queryName, String tsvPath)
             _tsvPath = tsvPath;
         }
 
+        public TsvImport(String schemaName, String queryName, String tsvPath, String containerPath)
+        {
+           this(schemaName, queryName, tsvPath);
+            _containerPath = containerPath;
+        }
+
         @Override
         public boolean equals(Object o)
         {

ehr/api-src/org/labkey/api/ehr/dataentry/SingleQueryFormSection.java

@@ -16,6 +16,7 @@
 package org.labkey.api.ehr.dataentry;
 
 import org.json.JSONObject;
+import org.labkey.api.util.JsonUtil;
 import org.labkey.api.view.template.ClientDependency;
 
 import java.util.HashMap;
@@ -46,7 +47,7 @@ public JSONObject toJSON(DataEntryFormContext ctx, boolean includeFormElements)
         formConfig.put("title", null);
         formConfig.put("label", null);
         formConfig.put("maxItemsPerCol", 8);
-        ret.put("formConfig", formConfig);
+        ret.put("formConfig", JsonUtil.toJsonPreserveNulls(formConfig));
 
         return ret;
     }