Skip to content

Commit a3fded1

Browse files
Canceling Pipeline's Setup sends you back to an unstyled page (#7823)
## Rationale If you click on the pipeline grid's Setup button after it's refreshed itself via AJAX, cancelling the Setup action takes you "back" to the raw AJAX URL. ## Changes - Propagate the returnUrl value into the AJAX grid render
1 parent f375c6b commit a3fded1

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

pipeline/src/org/labkey/pipeline/status/PipelineQueryView.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ protected void populateButtonBar(DataView view, ButtonBar bar)
112112
{
113113
ActionButton button = new ActionButton(PipelineController.BrowseAction.class, "Process and Import Data");
114114
button.setActionType(ActionButton.Action.LINK);
115-
button.setURL(PageFlowUtil.urlProvider(PipelineUrls.class).urlBrowse(getContainer(), getViewContext().getActionURL()));
115+
button.setURL(PageFlowUtil.urlProvider(PipelineUrls.class).urlBrowse(getContainer(), _returnUrl == null ? getViewContext().getActionURL() : _returnUrl));
116116
bar.add(button);
117117
}
118118
}
@@ -144,7 +144,7 @@ protected void populateButtonBar(DataView view, ButtonBar bar)
144144
{
145145
ActionButton button = new ActionButton(PipelineController.SetupAction.class, "Setup");
146146
button.setActionType(ActionButton.Action.LINK);
147-
button.setURL(PipelineController.urlSetup(getContainer(), getViewContext().getActionURL()));
147+
button.setURL(PipelineController.urlSetup(getContainer(), _returnUrl == null ? getViewContext().getActionURL() : _returnUrl));
148148
bar.add(button);
149149
}
150150
}

0 commit comments

Comments
 (0)