From d6dda54d527452f0c2f79ebe99864c25cfb50171 Mon Sep 17 00:00:00 2001 From: Josh Eckels Date: Tue, 25 Mar 2025 18:36:02 -0700 Subject: [PATCH] Fix NPE when attempting to enable NextFlow in the root container (#531) --- nextflow/src/org/labkey/nextflow/NextFlowController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nextflow/src/org/labkey/nextflow/NextFlowController.java b/nextflow/src/org/labkey/nextflow/NextFlowController.java index 736b8e4f..a1c1e987 100644 --- a/nextflow/src/org/labkey/nextflow/NextFlowController.java +++ b/nextflow/src/org/labkey/nextflow/NextFlowController.java @@ -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"), @@ -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())); }