Skip to content

fixes for automated test failures #5100

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

Merged
labkey-klum merged 1 commit into from
Jan 5, 2024
Merged

fixes for automated test failures #5100

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
4 changes: 4 additions & 0 deletions study/src/org/labkey/study/controllers/publish/PublishController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,10 @@ public void run()
{
error("Failure", t);
}

if (getErrors() == 0)
setStatus(TaskStatus.complete);

info("Auto link to study complete");
}
}
Expand Down
2 changes: 2 additions & 0 deletions study/src/org/labkey/study/importer/CreateChildStudyPipelineJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ public boolean run(ViewContext context)
// Save the snapshot RowId to the destination study
StudyImpl mutableStudy = StudyManager.getInstance().getStudy(getDstContainer()).createMutable();
mutableStudy.setStudySnapshot(snapshot.getRowId());
StudyManager.getInstance().updateStudy(user, mutableStudy);

// export objects from the parent study, then import them into the new study
getLogger().info("Exporting data from parent study.");
Expand Down Expand Up @@ -311,6 +312,7 @@ public boolean run(ViewContext context)
new TopLevelStudyPropertiesImporter().process(studyImportContext, studyDir, errors);

// after the data has been imported, configure the new study setting for undefined timepoints
mutableStudy = StudyManager.getInstance().getStudy(getDstContainer()).createMutable();
if (sourceStudy.isFailForUndefinedTimepoints())
mutableStudy.setFailForUndefinedTimepoints(true);

Expand Down
4 changes: 2 additions & 2 deletions study/src/org/labkey/study/visitmanager/RelativeDateVisitManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ private void _updateVisitRowId()
return errors;
}

public @Nullable ValidationException recomputeDates(Date oldStartDate, User user)
public @NotNull ValidationException recomputeDates(Date oldStartDate, User user)
{
if (null != oldStartDate)
{
Expand All @@ -351,7 +351,7 @@ private void _updateVisitRowId()
return updateParticipantVisits(user, getStudy().getDatasets());
}
}
return null;
return new ValidationException();
}

// Return sql for fetching all datasets and their visit sequence numbers, given a container
Expand Down