Skip to content

Reconcile redirect handling #984

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-adam merged 3 commits into from
Feb 25, 2026
Merged

Reconcile redirect handling #984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fcbdebe
Reconcile redirect handling
labkey-adam Feb 21, 2026
f928c9e
Adjust redirect handling
labkey-adam Feb 22, 2026
4090a6c
Eliminate string-based RedirectException
labkey-adam Feb 22, 2026
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
2 changes: 1 addition & 1 deletion flow/src/org/labkey/flow/controllers/FlowController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions flow/src/org/labkey/flow/controllers/executescript/AnalysisScriptController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -390,7 +389,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();
Expand Down Expand Up @@ -442,7 +441,7 @@ public ModelAndView getView(ImportRunsForm form, BindException errors) throws Ex
public static class ShowUploadRunsAction extends SimpleRedirectAction<Object>
{
@Override
public URLHelper getRedirectURL(Object o)
public ActionURL getRedirectURL(Object o)
{
return urlProvider(PipelineUrls.class).urlBrowse(getContainer(), null);
}
Expand Down
2 changes: 1 addition & 1 deletion microarray/src/org/labkey/microarray/controllers/FeatureAnnotationSetController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public FeatureAnnotationSetController()
public static class BeginAction extends SimpleRedirectAction<Object>
{
@Override
public URLHelper getRedirectURL(Object o)
public ActionURL getRedirectURL(Object o)
{
return new ActionURL(ManageAction.class, getContainer());
}
Expand Down
5 changes: 1 addition & 4 deletions ms2/src/org/labkey/ms2/MS2Controller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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));
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion protein/src/org/labkey/protein/ProteinController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down