Merge 23.3 to develop

labkey-teamcity · labkey-teamcity · commit 3c04dd1dde84 · 2023-04-27T20:13:12.000Z
diff --git a/laboratory/src/org/labkey/laboratory/query/LaboratoryTableCustomizer.java b/laboratory/src/org/labkey/laboratory/query/LaboratoryTableCustomizer.java
@@ -299,7 +299,7 @@ public TableInfo getLookupTableInfo()
                             if (null == _table)
                             {
                                 // get forWrite==true because we modify this table
-                                TableInfo ti = ((UserSchema)getSchema()).getTable(_tableName, getLookupContainerFilter(), true, true);
+                                TableInfo ti = targetSchema.getTable(_tableName, getLookupContainerFilter(), true, true);
 
                                 ((MutableColumnInfo)ti.getColumn(qd.getTargetColumn())).setKeyField(true);
 

Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ public TableInfo getLookupTableInfo()`
`299`	`299`	`if (null == _table)`
`300`	`300`	`{`
`301`	`301`	`// get forWrite==true because we modify this table`
`302`		`- TableInfo ti = ((UserSchema)getSchema()).getTable(_tableName, getLookupContainerFilter(), true, true);`
	`302`	`+ TableInfo ti = targetSchema.getTable(_tableName, getLookupContainerFilter(), true, true);`
`303`	`303`
`304`	`304`	`((MutableColumnInfo)ti.getColumn(qd.getTargetColumn())).setKeyField(true);`
`305`	`305`