Merge pull request #162 from LabKey/fb_merge_23.3_to_develop

Merge discvr-23.3 to develop

Author: bbimber

LDK/api-src/org/labkey/api/ldk/table/ContainerScopedTable.java

@@ -124,12 +124,12 @@ protected class UpdateService extends SimpleQueryUpdateService
     {
         private KeyManager _keyManager = new KeyManager();
 
-        public UpdateService(SimpleUserSchema.SimpleTable ti)
+        public UpdateService(SimpleUserSchema.SimpleTable<?> ti)
         {
             super(ti, ti.getRealTable());
         }
 
-        public UpdateService(SimpleUserSchema.SimpleTable simpleTable, TableInfo table, DefaultQueryUpdateService.DomainUpdateHelper helper)
+        public UpdateService(SimpleUserSchema.SimpleTable<?> simpleTable, TableInfo table, DefaultQueryUpdateService.DomainUpdateHelper helper)
         {
             super(simpleTable, table, helper);
         }

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

@@ -1,12 +1,12 @@
 package org.labkey.ldk.query;
 
-import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.labkey.api.data.ColumnInfo;
 import org.labkey.api.data.MutableColumnInfo;
 import org.labkey.api.data.TableCustomizer;
 import org.labkey.api.data.TableInfo;
 import org.labkey.api.gwt.client.FacetingBehaviorType;
+import org.labkey.api.util.logging.LogHelper;
 
 import java.sql.Timestamp;
 
@@ -18,7 +18,7 @@
  */
 public class BuiltInColumnsCustomizer implements TableCustomizer
 {
-    private static final Logger _log = LogManager.getLogger(TableCustomizer.class);
+    private static final Logger _log = LogHelper.getLogger(TableCustomizer.class, "Logs information from BuiltInColumnsCustomizer");
     private boolean _disableFacetingForNumericCols = true;
 
     public BuiltInColumnsCustomizer()
@@ -136,6 +136,12 @@ private static void setNonEditable(MutableColumnInfo col)
 
         public static void processColumn(MutableColumnInfo col)
         {
+            if (col.isLocked())
+            {
+                _log.debug("BuiltInColumnsCustomizer was called on a locked column: " + col.getName(), new Exception());
+                return;
+            }
+
             for (COL_ENUM colEnum : COL_ENUM.values())
             {
                 if (colEnum.name().equalsIgnoreCase(col.getName()))

laboratory/resources/schemas/laboratory.xml

@@ -57,7 +57,6 @@
                 <isReadOnly>true</isReadOnly>
                 <isHidden>true</isHidden>
                 <isUserEditable>false</isUserEditable>
-                <isUnselectable>true</isUnselectable>
                 <fk>
                     <fkColumnName>ObjectUri</fkColumnName>
                     <fkTable>Object</fkTable>
@@ -112,7 +111,6 @@
                 <isReadOnly>true</isReadOnly>
                 <isHidden>true</isHidden>
                 <isUserEditable>false</isUserEditable>
-                <isUnselectable>true</isUnselectable>
                 <fk>
                     <fkColumnName>ObjectUri</fkColumnName>
                     <fkTable>Object</fkTable>
@@ -556,7 +554,6 @@
                 <isReadOnly>true</isReadOnly>
                 <isHidden>true</isHidden>
                 <isUserEditable>false</isUserEditable>
-                <isUnselectable>true</isUnselectable>
                 <fk>
                     <fkColumnName>ObjectUri</fkColumnName>
                     <fkTable>Object</fkTable>
@@ -808,7 +805,6 @@
                 <isReadOnly>true</isReadOnly>
                 <isHidden>true</isHidden>
                 <isUserEditable>false</isUserEditable>
-                <isUnselectable>true</isUnselectable>
                 <fk>
                     <fkColumnName>ObjectUri</fkColumnName>
                     <fkTable>Object</fkTable>