Merge pull request #172 from LabKey/fb_merge_23.11_to_develop

Merge discvr-23.11 to develop

Author: bbimber

laboratory/src/org/labkey/laboratory/query/LaboratoryTableCustomizer.java

@@ -71,6 +71,12 @@ public LaboratoryTableCustomizer(MultiValuedMap props)
     @Override
     public void customize(TableInfo ti)
     {
+        if (ti.isLocked())
+        {
+            _log.debug("LaboratoryTableCustomizer called on a locked table: " + ti.getPublicSchemaName() + " / " + ti.getName(), new Exception());
+            return;
+        }
+
         //apply defaults
         TableCustomizer tc = LDKService.get().getBuiltInColumnsCustomizer(true);
         tc.customize(ti);
@@ -164,7 +170,7 @@ else if (keyFields.size() != 1)
 
     public void customizeColumns(AbstractTableInfo  ti)
     {
-        var container = ti.getMutableColumn("container");
+        MutableColumnInfo container = ti.getMutableColumn("container");
         if (container == null)
         {
             container = ti.getMutableColumn("folder");