Merge discvr-23.3 to discvr-23.7

Author: bbimber

LDK/resources/schemas/dbscripts/sqlserver/Naturalize_install_1.0.1.sql

@@ -88,7 +88,7 @@ GO
 -- Create (or replace) a simple function that returns the version number of the newly installed assembly
 IF EXISTS (SELECT  *
     FROM  sys.objects
-      WHERE   object_id = OBJECT_ID(N' ldk.NaturalizeVersion')
+      WHERE   object_id = OBJECT_ID(N'ldk.NaturalizeVersion')
         AND type = N'FN')
   DROP FUNCTION  ldk.NaturalizeVersion;
 GO

LDK/src/org/labkey/ldk/query/BuiltInColumnsCustomizer.java

@@ -39,6 +39,12 @@ public void customize(TableInfo table)
             }
         }
 
+        if (table.isLocked())
+        {
+            _log.debug("BuildInColumnsCustomizer called on a locked table: " + table.getPublicSchemaName() + " / " + table.getName(), new Exception());
+            return;
+        }
+
         table.setDefaultVisibleColumns(null);
     }
 

laboratory/src/org/labkey/laboratory/ExtraDataSourcesDataProvider.java

@@ -189,12 +189,16 @@ public List<SummaryNavItem> getSummary(Container c, User u)
         Set<AdditionalDataSource> sources = service.getAdditionalDataSources(c, u);
         for (AdditionalDataSource source : sources)
         {
-            TableInfo ti = source.getTableInfo(c, u);
-            if (ti != null)
+            if (source.getItemType() == LaboratoryService.NavItemCategory.data || source.getItemType() == LaboratoryService.NavItemCategory.samples)
             {
-                assert ti.getPublicSchemaName() != null;
-                assert ti.getPublicName() != null;
-                items.add(new QueryCountNavItem(this, ti.getPublicSchemaName(), ti.getPublicName(), source.getItemType(), source.getReportCategory(), source.getLabel()));
+                TableInfo ti = source.getTableInfo(c, u);
+                if (ti != null)
+                {
+                    assert ti.getPublicSchemaName() != null;
+                    assert ti.getPublicName() != null;
+
+                    items.add(new QueryCountNavItem(this, ti.getPublicSchemaName(), ti.getPublicName(), source.getItemType(), source.getReportCategory(), source.getLabel()));
+                }
             }
         }