Skip to content

[bot] Fast-forward for 25.3.2 #537

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
github-actions merged 2 commits into from
Apr 2, 2025
Merged

[bot] Fast-forward for 25.3.2 #537

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6dda54
Fix NPE when attempting to enable NextFlow in the root container (#531)
labkey-jeckels Mar 26, 2025
ae00ef4
Merge 24.11 to 25.3
labkey-teamcity Mar 31, 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
3 changes: 1 addition & 2 deletions nextflow/src/org/labkey/nextflow/NextFlowController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,6 @@ public ModelAndView getView(EnabledForm form, boolean reshow, BindException erro
if (getUser().hasSiteAdminPermission())
{
Boolean status = NextFlowManager.get().getEnabledState(getContainer());
boolean inheritedStatus = NextFlowManager.get().isEnabled(getContainer().getParent());

return new HtmlView("Enable or Disable NextFlow",
FORM(at(method, "POST"),
Expand All @@ -209,7 +208,7 @@ public ModelAndView getView(EnabledForm form, boolean reshow, BindException erro
DIV(INPUT(at(type, "radio", name, "enabled", value, "", (status == null ? checked : null), null)),
getContainer().isRoot() ?
"Unset" :
"Inherited from " + getContainer().getParent().getPath() + " (currently " + (inheritedStatus ? "enabled" : "disabled") + ")"),
"Inherited from " + getContainer().getParent().getPath() + " (currently " + (NextFlowManager.get().isEnabled(getContainer().getParent()) ? "enabled" : "disabled") + ")"),
new Button.ButtonBuilder("Save").submit(true).build(), " ",
new Button.ButtonBuilder("Cancel").href(getContainer().getStartURL(getUser())).build()));
}
Expand Down