Skip to content

Issue 52395: NPE in PanoramaPublicController$DeleteExperimentAnnotation #553

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-jeckels merged 2 commits into from
May 16, 2025
Merged

Issue 52395: NPE in PanoramaPublicController$DeleteExperimentAnnotation #553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6385c53
Issue 52395: NPE in.PanoramaPublicController$DeleteExperimentAnnotati…
labkey-jeckels May 15, 2025
18bf982
Widen panoramapublic.ExperimentAnnotations.LabHeadAffiliation
labkey-jeckels May 15, 2025
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
1 change: 1 addition & 0 deletions panoramapublic/resources/schemas/dbscripts/postgresql/panoramapublic-25.000-25.001.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TABLE panoramapublic.experimentannotations ALTER COLUMN LabHeadAffiliation TYPE VARCHAR(300);
8 changes: 4 additions & 4 deletions panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6058,11 +6058,11 @@ else if(children.size() > 0)

// If this experiment has been submitted show the submission requests
List<JournalSubmission> jsList = SubmissionManager.getAllJournalSubmissions(exptAnnotations);
if (jsList.size() > 0 && getContainer().hasPermission(getUser(), AdminPermission.class))
if (!jsList.isEmpty() && getContainer().hasPermission(getUser(), AdminPermission.class))
{
QuerySettings qSettings = new QuerySettings(getViewContext(), "Submission", "Submission");
qSettings.setBaseFilter(new SimpleFilter(new SimpleFilter.InClause(FieldKey.fromParts("JournalExperimentId"),
jsList.stream().map(js -> js.getJournalExperimentId()).collect(Collectors.toList()))));
jsList.stream().map(JournalSubmission::getJournalExperimentId).collect(Collectors.toList()))));
QueryView submissionList = new QueryView(new PanoramaPublicSchema(getUser(), getContainer()), qSettings, errors);
submissionList.setShowRecordSelectors(false);
submissionList.setButtonBarPosition(DataRegion.ButtonBarPosition.TOP);
Expand Down Expand Up @@ -6102,7 +6102,7 @@ public void addNavTrail(NavTree root)
public static class ExperimentAnnotationsDetails
{
private final ExperimentAnnotations _experimentAnnotations;
private JournalSubmission _lastSubmittedRecord;
private final JournalSubmission _lastSubmittedRecord;
private final boolean _fullDetails;
private boolean _canPublish;
private String _version;
Expand Down Expand Up @@ -6590,7 +6590,7 @@ public void validateCommand(DeleteExperimentAnnotationsForm deleteForm, Errors e
{
errors.reject(ERROR_MSG, "Could not find an experiment with ID " + _experimentAnnotationsId);
}
if(_expAnnotations.isJournalCopy() && _expAnnotations.isFinal())
else if(_expAnnotations.isJournalCopy() && _expAnnotations.isFinal())
{
errors.reject(ERROR_MSG, "Experiment cannot be deleted. It is public and is associated with a publication.");
}
Expand Down
2 changes: 1 addition & 1 deletion panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public String getName()
@Override
public @Nullable Double getSchemaVersion()
{
return 23.001;
return 25.001;
}

@Override
Expand Down