From fcbdebeb598c7f9b337276b0431c0effd4b131b1 Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Sat, 21 Feb 2026 13:28:07 -0800 Subject: [PATCH 1/3] Reconcile redirect handling --- flow/src/org/labkey/flow/controllers/FlowController.java | 2 +- .../controllers/executescript/AnalysisScriptController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flow/src/org/labkey/flow/controllers/FlowController.java b/flow/src/org/labkey/flow/controllers/FlowController.java index e3823a2b8..44a003fb5 100644 --- a/flow/src/org/labkey/flow/controllers/FlowController.java +++ b/flow/src/org/labkey/flow/controllers/FlowController.java @@ -367,7 +367,7 @@ public ModelAndView getView(Object o, BindException errors) throws Exception { FlowPreference.update(getRequest()); URLHelper url = new URLHelper(getRequest().getContextPath() + "/_.gif"); - return HttpView.redirect(url, false); + return HttpView.redirect(url); } @Override diff --git a/flow/src/org/labkey/flow/controllers/executescript/AnalysisScriptController.java b/flow/src/org/labkey/flow/controllers/executescript/AnalysisScriptController.java index a9b16269e..83d7aee37 100644 --- a/flow/src/org/labkey/flow/controllers/executescript/AnalysisScriptController.java +++ b/flow/src/org/labkey/flow/controllers/executescript/AnalysisScriptController.java @@ -390,7 +390,7 @@ protected ModelAndView uploadRuns(ImportRunsForm form, BindException errors) thr ActionURL url = form.getReturnActionURL(); if (url == null) url = new ActionURL(BeginAction.class, getContainer()); - return HttpView.redirect(url, false); + return HttpView.redirect(url); } validatePipeline(); From f928c9eb2e1e6ced96c2b68a666843b21f78d467 Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Sun, 22 Feb 2026 12:56:02 -0800 Subject: [PATCH 2/3] Adjust redirect handling --- .../controllers/executescript/AnalysisScriptController.java | 3 +-- .../microarray/controllers/FeatureAnnotationSetController.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/flow/src/org/labkey/flow/controllers/executescript/AnalysisScriptController.java b/flow/src/org/labkey/flow/controllers/executescript/AnalysisScriptController.java index 83d7aee37..801a8a39d 100644 --- a/flow/src/org/labkey/flow/controllers/executescript/AnalysisScriptController.java +++ b/flow/src/org/labkey/flow/controllers/executescript/AnalysisScriptController.java @@ -46,7 +46,6 @@ import org.labkey.api.util.PageFlowUtil; import org.labkey.api.util.Pair; import org.labkey.api.util.URIUtil; -import org.labkey.api.util.URLHelper; import org.labkey.api.util.logging.LogHelper; import org.labkey.api.view.ActionURL; import org.labkey.api.view.BadRequestException; @@ -442,7 +441,7 @@ public ModelAndView getView(ImportRunsForm form, BindException errors) throws Ex public static class ShowUploadRunsAction extends SimpleRedirectAction { @Override - public URLHelper getRedirectURL(Object o) + public ActionURL getRedirectURL(Object o) { return urlProvider(PipelineUrls.class).urlBrowse(getContainer(), null); } diff --git a/microarray/src/org/labkey/microarray/controllers/FeatureAnnotationSetController.java b/microarray/src/org/labkey/microarray/controllers/FeatureAnnotationSetController.java index 8aa00bc4f..d0d9fbc83 100644 --- a/microarray/src/org/labkey/microarray/controllers/FeatureAnnotationSetController.java +++ b/microarray/src/org/labkey/microarray/controllers/FeatureAnnotationSetController.java @@ -86,7 +86,7 @@ public FeatureAnnotationSetController() public static class BeginAction extends SimpleRedirectAction { @Override - public URLHelper getRedirectURL(Object o) + public ActionURL getRedirectURL(Object o) { return new ActionURL(ManageAction.class, getContainer()); } From 4090a6ca685abb2a6443168f6e9130476654eff4 Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Sun, 22 Feb 2026 15:40:31 -0800 Subject: [PATCH 3/3] Eliminate string-based RedirectException --- ms2/src/org/labkey/ms2/MS2Controller.java | 5 +---- protein/src/org/labkey/protein/ProteinController.java | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ms2/src/org/labkey/ms2/MS2Controller.java b/ms2/src/org/labkey/ms2/MS2Controller.java index 212ea0124..da0aab5fa 100644 --- a/ms2/src/org/labkey/ms2/MS2Controller.java +++ b/ms2/src/org/labkey/ms2/MS2Controller.java @@ -72,8 +72,6 @@ import org.labkey.api.exp.api.ExpData; import org.labkey.api.exp.api.ExpRun; import org.labkey.api.exp.api.ExperimentService; -import org.labkey.api.pipeline.PipeRoot; -import org.labkey.api.pipeline.PipelineJob; import org.labkey.api.pipeline.PipelineService; import org.labkey.api.pipeline.PipelineUrls; import org.labkey.api.pipeline.browse.PipelinePathForm; @@ -150,7 +148,6 @@ import org.labkey.api.view.RedirectException; import org.labkey.api.view.UnauthorizedException; import org.labkey.api.view.VBox; -import org.labkey.api.view.ViewBackgroundInfo; import org.labkey.api.view.ViewContext; import org.labkey.api.view.WebPartView; import org.labkey.api.view.template.PageConfig; @@ -400,7 +397,7 @@ public ModelAndView getView(RunForm form, BindException errors) if (params != null && !params.trim().isEmpty()) { - throw new RedirectException(currentURL + "&" + params); + throw new RedirectException(new ActionURL(currentURL + "&" + params)); } } } diff --git a/protein/src/org/labkey/protein/ProteinController.java b/protein/src/org/labkey/protein/ProteinController.java index e5d0648b2..f5c9705b0 100644 --- a/protein/src/org/labkey/protein/ProteinController.java +++ b/protein/src/org/labkey/protein/ProteinController.java @@ -214,7 +214,7 @@ protected ModelAndView getHtmlView(ProbabilityProteinSearchForm form, BindExcept ActionURL url = getViewContext().cloneActionURL(); url.deleteParameter("minimumProbability"); url.deleteParameter("maximumErrorRate"); - throw new RedirectException(url + "&" + filter.toQueryString("ProteinSearchResults")); + throw new RedirectException(new ActionURL(url + "&" + filter.toQueryString("ProteinSearchResults"))); } if (request.getParameter("ProteinSearchResults.GroupProbability~gte") != null)