From d50c30ca52fbc0221c95bc71e1cc3f5fa2fa588d Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Tue, 7 Jul 2026 17:37:12 -0700 Subject: [PATCH 1/2] GitHub Issue 1267: Canceling Pipeline's Setup sends you back to an unstyled page --- pipeline/src/org/labkey/pipeline/status/PipelineQueryView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipeline/src/org/labkey/pipeline/status/PipelineQueryView.java b/pipeline/src/org/labkey/pipeline/status/PipelineQueryView.java index daf399ae683..eb45ee62853 100644 --- a/pipeline/src/org/labkey/pipeline/status/PipelineQueryView.java +++ b/pipeline/src/org/labkey/pipeline/status/PipelineQueryView.java @@ -144,7 +144,7 @@ protected void populateButtonBar(DataView view, ButtonBar bar) { ActionButton button = new ActionButton(PipelineController.SetupAction.class, "Setup"); button.setActionType(ActionButton.Action.LINK); - button.setURL(PipelineController.urlSetup(getContainer(), getViewContext().getActionURL())); + button.setURL(PipelineController.urlSetup(getContainer(), _returnUrl == null ? getViewContext().getActionURL() : _returnUrl)); bar.add(button); } } From 992dbd01175dafce927ea1bd6049c20d7117c208 Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Tue, 7 Jul 2026 17:47:42 -0700 Subject: [PATCH 2/2] One more button --- pipeline/src/org/labkey/pipeline/status/PipelineQueryView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipeline/src/org/labkey/pipeline/status/PipelineQueryView.java b/pipeline/src/org/labkey/pipeline/status/PipelineQueryView.java index eb45ee62853..5ef92e59dee 100644 --- a/pipeline/src/org/labkey/pipeline/status/PipelineQueryView.java +++ b/pipeline/src/org/labkey/pipeline/status/PipelineQueryView.java @@ -112,7 +112,7 @@ protected void populateButtonBar(DataView view, ButtonBar bar) { ActionButton button = new ActionButton(PipelineController.BrowseAction.class, "Process and Import Data"); button.setActionType(ActionButton.Action.LINK); - button.setURL(PageFlowUtil.urlProvider(PipelineUrls.class).urlBrowse(getContainer(), getViewContext().getActionURL())); + button.setURL(PageFlowUtil.urlProvider(PipelineUrls.class).urlBrowse(getContainer(), _returnUrl == null ? getViewContext().getActionURL() : _returnUrl)); bar.add(button); } }