Skip to content

Commit 7dfae60

Browse files
labkey-jeckelslabkey-jeckels
committed
Complete migration from srcURL and returnURL to returnUrl
1 parent 2381890 commit 7dfae60

11 files changed

+36
-36
lines changed

‎panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicController.java‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2210,7 +2210,7 @@ private HtmlView getConfirmIncludeSubfoldersView(ExperimentAnnotations expAnnota
22102210
{
22112211
ActionURL includeSubfoldersUrl = new ActionURL(IncludeSubFoldersInExperimentAction.class, _experimentAnnotations.getContainer())
22122212
.addParameter("id", expAnnotations.getId())
2213-
.addReturnURL(skipSubfolderCheckUrl);
2213+
.addReturnUrl(skipSubfolderCheckUrl);
22142214
HtmlView confirmView = new HtmlView(DIV("Would you like to include data from the following subfolders in the experiment?",
22152215
getSubfolderListHtml(expAnnotations.getContainer(), allSubfolders),
22162216
new Button.ButtonBuilder("Include Subfolders and Continue").href(includeSubfoldersUrl).usePost().build(),
@@ -5381,7 +5381,7 @@ public URLHelper getSuccessURL(NewExperimentAnnotationsForm form)
53815381
return getViewExperimentDetailsURL(_expAnnot.getId(), getContainer());
53825382
}
53835383
else
5384-
return form.getReturnURLHelper();
5384+
return form.getReturnUrlHelper();
53855385
}
53865386

53875387
@Override
@@ -5600,7 +5600,7 @@ else if(children.size() > 0)
56005600
vBox.addView(submissionList);
56015601

56025602
ActionURL url = PanoramaPublicController.getDataValidationCheckUrl(exptAnnotations.getId(), exptAnnotations.getContainer(), true);
5603-
url.addReturnURL(getViewExperimentDetailsURL(exptAnnotations.getId(), exptAnnotations.getContainer()));
5603+
url.addReturnUrl(getViewExperimentDetailsURL(exptAnnotations.getId(), exptAnnotations.getContainer()));
56045604
vBox.addView(new HtmlView(DIV(new Link.LinkBuilder("Validate for ProteomeXchange").href(url).build())));
56055605

56065606
result.addView(vBox);
@@ -7926,7 +7926,7 @@ public ModelAndView getView(UnimodMatchForm form, BindException errors) throws E
79267926
.addParameter("modificationId", form.getModificationId());
79277927
if (form.getReturnActionURL() != null)
79287928
{
7929-
findMatchUrl.addReturnURL(form.getReturnActionURL());
7929+
findMatchUrl.addReturnUrl(form.getReturnActionURL());
79307930
}
79317931
if (form.getCancelActionURL() != null)
79327932
{
@@ -7938,7 +7938,7 @@ public ModelAndView getView(UnimodMatchForm form, BindException errors) throws E
79387938
.addParameter("modificationId", form.getModificationId());
79397939
if (form.getReturnActionURL() != null)
79407940
{
7941-
comboModUrl.addReturnURL(form.getReturnActionURL());
7941+
comboModUrl.addReturnUrl(form.getReturnActionURL());
79427942
}
79437943
if (form.getCancelActionURL() != null)
79447944
{
@@ -9498,45 +9498,45 @@ public void setExperiments(List<ExperimentAnnotations> experiments)
94989498
}
94999499
}
95009500

9501-
public static ActionURL getEditExperimentDetailsURL(Container c, int experimentAnnotationsId, URLHelper returnURL)
9501+
public static ActionURL getEditExperimentDetailsURL(Container c, int experimentAnnotationsId, URLHelper returnUrl)
95029502
{
95039503
ActionURL url = new ActionURL(ShowUpdateExperimentAnnotationsAction.class, c);
95049504
url.addParameter("id", experimentAnnotationsId); // The name of the parameter is important. This is used to populate the TableViewForm (refreshFromDb())
9505-
if(returnURL != null)
9505+
if(returnUrl != null)
95069506
{
9507-
url.addReturnURL(returnURL);
9507+
url.addReturnUrl(returnUrl);
95089508
}
95099509
return url;
95109510
}
95119511

9512-
public static ActionURL getDeleteExperimentURL(Container c, int experimentAnnotationsId, URLHelper returnURL)
9512+
public static ActionURL getDeleteExperimentURL(Container c, int experimentAnnotationsId, URLHelper returnUrl)
95139513
{
95149514
ActionURL url = new ActionURL(DeleteExperimentAnnotationsAction.class, c);
95159515
url.addParameter("id", experimentAnnotationsId);
9516-
if(returnURL != null)
9516+
if(returnUrl != null)
95179517
{
9518-
url.addReturnURL(returnURL);
9518+
url.addReturnUrl(returnUrl);
95199519
}
95209520
return url;
95219521
}
95229522

9523-
public static ActionURL getIncludeSubfoldersInExperimentURL(int experimentAnnotationsId, Container container, URLHelper returnURL)
9523+
public static ActionURL getIncludeSubfoldersInExperimentURL(int experimentAnnotationsId, Container container, URLHelper returnUrl)
95249524
{
95259525
ActionURL result = new ActionURL(IncludeSubFoldersInExperimentAction.class, container);
9526-
if (returnURL != null)
9526+
if (returnUrl != null)
95279527
{
9528-
result.addReturnURL(returnURL);
9528+
result.addReturnUrl(returnUrl);
95299529
}
95309530
result.addParameter("id", experimentAnnotationsId);
95319531
return result;
95329532
}
95339533

9534-
public static ActionURL getExcludeSubfoldersInExperimentURL(int experimentAnnotationsId, Container container, URLHelper returnURL)
9534+
public static ActionURL getExcludeSubfoldersInExperimentURL(int experimentAnnotationsId, Container container, URLHelper returnUrl)
95359535
{
95369536
ActionURL result = new ActionURL(ExcludeSubFoldersInExperimentAction.class, container);
9537-
if (returnURL != null)
9537+
if (returnUrl != null)
95389538
{
9539-
result.addReturnURL(returnURL);
9539+
result.addReturnUrl(returnUrl);
95409540
}
95419541
result.addParameter("id", experimentAnnotationsId);
95429542
return result;

‎panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicNotification.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ public static String replaceLinkPlaceholders(@NotNull String text, @NotNull Expe
330330
.addParameter("rowId", announcement.getRowId());
331331
ActionURL respondToMessageUrl = new ActionURL("announcements", "respond", announcementContainer)
332332
.addParameter("parentId", announcement.getEntityId())
333-
.addReturnURL(viewMessageUrl);
333+
.addReturnUrl(viewMessageUrl);
334334
toReturn = toReturn.replaceAll(PLACEHOLDER_RESPOND_TO_MESSAGE_URL, respondToMessageUrl.getURIString());
335335
}
336336
if (toReturn.contains(PLACEHOLDER_MAKE_DATA_PUBLIC_URL))

‎panoramapublic/src/org/labkey/panoramapublic/query/CatalogEntryTableInfo.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public void renderGridCellContents(RenderContext ctx, Writer out) throws IOExcep
6868
Object viewCatalogEntryUrl = getValue(ctx);
6969
if (viewCatalogEntryUrl instanceof ActionURL url)
7070
{
71-
url.addReturnURL(ctx.getViewContext().getActionURL());
71+
url.addReturnUrl(ctx.getViewContext().getActionURL());
7272
var viewButton = new Button.ButtonBuilder("View").href(url).build();
7373
viewButton.appendTo(out);
7474
return;

‎panoramapublic/src/org/labkey/panoramapublic/query/ExperimentAnnotationsTableInfo.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -822,8 +822,8 @@ public void renderGridCellContents(RenderContext ctx, Writer out) throws IOExcep
822822
: AppProps.getInstance().getContextPath() + "/PanoramaPublic/images/slideshow-icon.png";
823823
String imageTitle = entry != null ? "View catalog entry" : "Add catalog entry";
824824
ActionURL returnUrl = ctx.getViewContext().getActionURL().clone();
825-
ActionURL catalogEntryLink = entry != null ? PanoramaPublicController.getViewCatalogEntryUrl(expAnnot, entry).addReturnURL(returnUrl)
826-
: PanoramaPublicController.getAddCatalogEntryUrl(expAnnot).addReturnURL(returnUrl);
825+
ActionURL catalogEntryLink = entry != null ? PanoramaPublicController.getViewCatalogEntryUrl(expAnnot, entry).addReturnUrl(returnUrl)
826+
: PanoramaPublicController.getAddCatalogEntryUrl(expAnnot).addReturnUrl(returnUrl);
827827
DOM.A(at(href, catalogEntryLink.getLocalURIString(), title, PageFlowUtil.filter(imageTitle)),
828828
DOM.IMG(at(src, imageUrl, height, 22, width, 22)))
829829
.appendTo(out);

‎panoramapublic/src/org/labkey/panoramapublic/query/speclib/EditLibInfoDisplayColumnFactory.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,18 @@ public void renderGridCellContents(RenderContext ctx, Writer out) throws IOExcep
5151
}
5252
if (experimentAnnotationsId != null)
5353
{
54-
URLHelper returnUrl = ctx.getViewContext().getActionURL().getReturnURL();
54+
URLHelper returnUrl = ctx.getViewContext().getActionURL().getReturnUrl();
5555
if (returnUrl == null)
5656
{
5757
returnUrl = ctx.getViewContext().getActionURL();
5858
}
5959
ActionURL editUrl = PanoramaPublicController.getEditSpecLibInfoURL(experimentAnnotationsId, specLibId, specLibInfoId, ctx.getContainer());
60-
editUrl.addReturnURL(returnUrl);
60+
editUrl.addReturnUrl(returnUrl);
6161
out.write(PageFlowUtil.link(specLibInfoId != null ? "Edit" : "Add").href(editUrl).toString());
6262
if (specLibInfoId != null)
6363
{
6464
ActionURL deleteUrl = PanoramaPublicController.getDeleteSpecLibInfoURL(experimentAnnotationsId, specLibInfoId, ctx.getContainer());
65-
deleteUrl.addReturnURL(returnUrl);
65+
deleteUrl.addReturnUrl(returnUrl);
6666
out.write(PageFlowUtil.link("Delete").href(deleteUrl).usePost("Are you sure you want to delete the spectral library information?").toString());
6767
}
6868
return;

‎panoramapublic/src/org/labkey/panoramapublic/view/PanoramaPublicRunListView.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ protected void populateButtonBar(DataView view, ButtonBar bar)
5151
{
5252
String buttonText = _expAnnotations.isIncludeSubfolders() ? "Exclude Subfolders" : "Include Subfolders";
5353
ActionURL url = _expAnnotations.isIncludeSubfolders() ?
54-
PanoramaPublicController.getExcludeSubfoldersInExperimentURL(_expAnnotations.getId(), getViewContext().getContainer(), getReturnURL()) :
55-
PanoramaPublicController.getIncludeSubfoldersInExperimentURL(_expAnnotations.getId(), getViewContext().getContainer(), getReturnURL());
54+
PanoramaPublicController.getExcludeSubfoldersInExperimentURL(_expAnnotations.getId(), getViewContext().getContainer(), getReturnUrl()) :
55+
PanoramaPublicController.getIncludeSubfoldersInExperimentURL(_expAnnotations.getId(), getViewContext().getContainer(), getReturnUrl());
5656

5757
ActionButton includeSubfoldersBtn = new ActionButton(buttonText, url);
5858
includeSubfoldersBtn.setDisplayPermission(InsertPermission.class);

‎panoramapublic/src/org/labkey/panoramapublic/view/combinationModInfo.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
var modification = bean.getModification();
2525
var modFormula = bean.getModFormula();
2626
var unimodMods = bean.getUnimodModificationList();
27-
var returnUrl = form.getReturnURLHelper();
27+
var returnUrl = form.getReturnUrlHelper();
2828
var cancelUrl = form.getCancelActionURL(PanoramaPublicController.getViewExperimentModificationsURL(form.getId(), getContainer()));
2929
%>
3030
<labkey:errors/>

‎panoramapublic/src/org/labkey/panoramapublic/view/editSpecLibInfo.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
var bean = view.getModelBean();
2121
var form = bean.getForm();
2222
var library = bean.getLibrary();
23-
var returnUrl = form.getReturnURLHelper(getContainer().getStartURL(getUser()));
23+
var returnUrl = form.getReturnUrlHelper(getContainer().getStartURL(getUser()));
2424
%>
2525

2626
<div style="margin-bottom:10px;">

‎panoramapublic/src/org/labkey/panoramapublic/view/publish/CatalogEntryWebPart.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public CatalogEntryWebPart(ExperimentAnnotations expAnnotations, User user, @Nul
5555
"Click the button below to add an entry.",
5656
BR(),
5757
new Button.ButtonBuilder("Add Catalog Entry").href(PanoramaPublicController.getAddCatalogEntryUrl(expAnnotations)
58-
.addReturnURL(getViewContext().getActionURL()))
58+
.addReturnUrl(getViewContext().getActionURL()))
5959
)));
6060
}
6161
else
@@ -68,17 +68,17 @@ public CatalogEntryWebPart(ExperimentAnnotations expAnnotations, User user, @Nul
6868
.build();
6969
}
7070

71-
URLHelper ctxReturnUrl = getViewContext().getActionURL().getReturnURL();
71+
URLHelper ctxReturnUrl = getViewContext().getActionURL().getReturnUrl();
7272
ActionURL deleteUrl = new ActionURL(PanoramaPublicController.DeleteCatalogEntryAction.class, container)
7373
.addParameter("id", expAnnotations.getId());
7474
if (ctxReturnUrl != null)
7575
{
76-
deleteUrl.addReturnURL(ctxReturnUrl);
76+
deleteUrl.addReturnUrl(ctxReturnUrl);
7777
}
7878

7979
ActionURL editUrl = new ActionURL(PanoramaPublicController.EditCatalogEntryAction.class, container)
8080
.addParameter("id", expAnnotations.getId())
81-
.addReturnURL(ctxReturnUrl != null ? ctxReturnUrl : getContextURLHelper());
81+
.addReturnUrl(ctxReturnUrl != null ? ctxReturnUrl : getContextURLHelper());
8282

8383
CatalogEntrySettings settings = CatalogEntryManager.getCatalogEntrySettings();
8484
addView(new HtmlView(
@@ -130,7 +130,7 @@ public static Button.ButtonBuilder changeStatusButtonBuilder(Boolean status, int
130130
.addParameter("id", expAnnotationsId)
131131
.addParameter("catalogEntryId", catalogEntryId)
132132
.addParameter("approve", approve)
133-
.addReturnURL(getContextURLHelper()))
133+
.addReturnUrl(getContextURLHelper()))
134134
.usePost("Are you sure you want to " + btnTxt.toLowerCase() + " this catalog entry?");
135135
}
136136
}

‎panoramapublic/src/org/labkey/panoramapublic/view/publish/pxActions.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
fieldLabel: "Update PX ID And Submission Type",
187187
autoEl: {tag: 'a',
188188
href: <%=q(urlFor(UpdatePxDetailsAction.class).addParameter("id", expAnnot.getId())
189-
.addReturnURL(PageFlowUtil.urlProvider(ProjectUrls.class).getBeginURL(expAnnot.getContainer())))%>,
189+
.addReturnUrl(PageFlowUtil.urlProvider(ProjectUrls.class).getBeginURL(expAnnot.getContainer())))%>,
190190
html: 'Update PX ID And Submission Type',
191191
style: 'font-weight: bold'}
192192
}

0 commit comments

Comments
 (0)