Merge 24.3 to develop

Author: labkey-teamcity

OConnorExperiments/src/org/labkey/oconnorexperiments/query/ExperimentsTable.java

@@ -197,7 +197,7 @@ public void addColumns()
         //UserSchema targetSchema = getUserSchema().getContainer().isWorkbook() ? new OConnorExperimentsUserSchema(getUserSchema().getUser(), getUserSchema().getContainer().getParent()) : getUserSchema();
         MultiValuedForeignKey parentExperimentsFk = new MultiValuedForeignKey(
                 QueryForeignKey
-                        .from(getUserSchema(), getContainerFilter())
+                        .from(getUserSchema(), getContainer().isWorkbook() ? ContainerFilter.Type.CurrentAndFirstChildren.create(getContainer().getParent(), getUserSchema().getUser()) : getContainerFilter())
                         .schema(OConnorExperimentsUserSchema.NAME, getContainer().isWorkbook() ? getContainer().getParent() : getContainer())
                         .to(OConnorExperimentsUserSchema.Table.ParentExperiments.name(), "Container", null),
                 "ParentExperiment");

OConnorExperiments/test/src/org/labkey/test/tests/OConnorExperimentTest.java

@@ -114,6 +114,10 @@ public void testSteps()
         updateViaExperimentWebpart(0, null, "type3", "1,2");
         verifyExperimentWebpart(0, "updated description 3", "type3", 1, 2);
 
+        // Make sure the values round-trip if they're not explicitly set
+        updateViaExperimentWebpart(0, null, null, null);
+        verifyExperimentWebpart(0, "updated description 3", "type3", 1, 2);
+
         testBulkUpdate();
 
         // delete via the webpart