Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue 49964: Experiment database: parent id is not populating #138

Merged
merged 1 commit into from
Mar 25, 2024
Merged

Issue 49964: Experiment database: parent id is not populating #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion OConnorExperiments/src/org/labkey/oconnorexperiments/query/ExperimentsTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
4 changes: 4 additions & 0 deletions OConnorExperiments/test/src/org/labkey/test/tests/OConnorExperimentTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down