Skip to content

Commit 5d6c80b

Browse files
authored
Update redirect() and eliminate HttpRedirectView (#906)
1 parent 0d0784e commit 5d6c80b

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

flow/src/org/labkey/flow/controllers/FlowController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ public void addNavTrail(NavTree root)
361361
}
362362

363363
@RequiresPermission(ReadPermission.class)
364-
public class SavePreferencesAction extends SimpleViewAction
364+
public class SavePreferencesAction extends SimpleViewAction<Object>
365365
{
366366
@Override
367367
public ModelAndView getView(Object o, BindException errors) throws Exception

flow/src/org/labkey/flow/controllers/executescript/AnalysisScriptController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -378,10 +378,10 @@ protected ModelAndView uploadRuns(ImportRunsForm form, BindException errors) thr
378378
{
379379
if (!form.isConfirm())
380380
{
381-
URLHelper url = form.getReturnUrlHelper();
381+
ActionURL url = form.getReturnActionURL();
382382
if (url == null)
383383
url = new ActionURL(BeginAction.class, getContainer());
384-
return HttpView.redirect(url);
384+
return HttpView.redirect(url, false);
385385
}
386386

387387
validatePipeline();

0 commit comments

Comments
 (0)