Skip to content

Complete migration from srcURL and returnURL to returnUrl #1023

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-jeckels merged 1 commit into from
Mar 5, 2025
Merged

Complete migration from srcURL and returnURL to returnUrl #1023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions resources/views/configureQCMetric.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,11 @@
});
}

function getReturnURL() {
var returnURL = LABKEY.ActionURL.getParameter('returnUrl');
function getReturnUrl() {
var returnUrl = LABKEY.ActionURL.getParameter('returnUrl');

if(returnURL) {
return returnURL;
if(returnUrl) {
return returnUrl;
}
else {
return LABKEY.ActionURL.buildURL('project', 'start');
Expand Down Expand Up @@ -162,7 +162,7 @@
},

resetQCMetrics: function(){
window.location = getReturnURL();
window.location = getReturnUrl();
},

showCustomMetricWindow: function (op, clickedMetric) {
Expand Down Expand Up @@ -302,12 +302,12 @@
commands: commands,
method: 'POST',
success: function (data) {
window.location = getReturnURL();
window.location = getReturnUrl();
},
failure: LABKEY.Utils.getCallbackWrapper(LABKEY.internal.ConfigureQCMetrics.onError, this, true)
});
} else {
window.location = getReturnURL();
window.location = getReturnUrl();
}

},
Expand Down
12 changes: 6 additions & 6 deletions resources/views/subscribeOutlierNotifications.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@
}
}

function getReturnURL() {
var returnURL = LABKEY.ActionURL.getParameter('returnUrl');
function getReturnUrl() {
var returnUrl = LABKEY.ActionURL.getParameter('returnUrl');

if(returnURL) {
return returnURL;
if(returnUrl) {
return returnUrl;
}
else {
return LABKEY.ActionURL.buildURL('project', 'start');
Expand All @@ -77,7 +77,7 @@
},

onCancel: function () {
window.location = getReturnURL();
window.location = getReturnUrl();
},

onSave: function () {
Expand Down Expand Up @@ -110,7 +110,7 @@
commands: commands,
method: 'POST',
success: function () {
window.location = getReturnURL();
window.location = getReturnUrl();
},
failure: LABKEY.Utils.getCallbackWrapper(LABKEY.internal.SubscribeQCNotification.onError, this, true)
});
Expand Down
8 changes: 4 additions & 4 deletions resources/web/PanoramaPremium/window/AddNewMetricWindow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,11 +579,11 @@ Ext4.define('Panorama.Window.AddCustomMetricWindow', {

},

getReturnURL: function () {
var returnURL = LABKEY.ActionURL.getParameter('returnUrl');
getReturnUrl: function () {
var returnUrl = LABKEY.ActionURL.getParameter('returnUrl');

if(returnURL) {
return returnURL;
if(returnUrl) {
return returnUrl;
}
else {
return LABKEY.ActionURL.buildURL('project', 'start');
Expand Down
8 changes: 4 additions & 4 deletions resources/web/PanoramaPremium/window/AddNewTraceMetricWindow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,11 +450,11 @@ Ext4.define('Panorama.Window.AddTraceMetricWindow', {
}, this);
},

getReturnURL: function () {
var returnURL = LABKEY.ActionURL.getParameter('returnUrl');
getReturnUrl: function () {
var returnUrl = LABKEY.ActionURL.getParameter('returnUrl');

if (returnURL) {
return returnURL;
if (returnUrl) {
return returnUrl;
}
else {
return LABKEY.ActionURL.buildURL('project', 'start');
Expand Down
4 changes: 1 addition & 3 deletions src/org/labkey/panoramapremium/View/QCSummaryMenuCustomizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
import org.labkey.api.view.NavTree;
import org.labkey.api.view.NavTreeCustomizer;
import org.labkey.api.view.ViewContext;
import org.labkey.panoramapremium.PanoramaPremiumController;
import org.labkey.targetedms.TargetedMSController;

import java.util.ArrayList;
import java.util.Collections;
Expand All @@ -31,7 +29,7 @@ public List<NavTree> getNavTrees(ViewContext viewContext)
if(viewContext.getContainer().hasPermission(viewContext.getUser(), AdminPermission.class))
{
List<NavTree> navTrees = new ArrayList<>();
ActionURL url = new ActionURL("targetedms", actionName, viewContext.getContainer()).addReturnURL(viewContext.getActionURL());
ActionURL url = new ActionURL("targetedms", actionName, viewContext.getContainer()).addReturnUrl(viewContext.getActionURL());
navTrees.add(new NavTree(menuLabel, url));

return navTrees;
Expand Down
18 changes: 9 additions & 9 deletions src/org/labkey/targetedms/TargetedMSController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7352,11 +7352,11 @@ public ActionURL getReturnActionURL()
}
}

public static ActionURL getRenameRunURL(Container c, TargetedMSRun run, ActionURL returnURL)
public static ActionURL getRenameRunURL(Container c, TargetedMSRun run, ActionURL returnUrl)
{
ActionURL url = new ActionURL(RenameRunAction.class, c);
url.addParameter("run", run.getRunId() );
url.addReturnURL(returnURL);
url.addReturnUrl(returnUrl);
return url;
}

Expand All @@ -7379,7 +7379,7 @@ public void setDescription(String description)
public class RenameRunAction extends FormViewAction<RenameForm>
{
private TargetedMSRun _run;
private URLHelper _returnURL;
private URLHelper _returnUrl;

@Override
public void validateCommand(RenameForm target, Errors errors)
Expand All @@ -7390,16 +7390,16 @@ public void validateCommand(RenameForm target, Errors errors)
public ModelAndView getView(RenameForm form, boolean reshow, BindException errors)
{
_run = validateRun(form.getRun());
_returnURL = form.getReturnURLHelper(getShowRunURL(getContainer(), form.getRun()));
_returnUrl = form.getReturnUrlHelper(getShowRunURL(getContainer(), form.getRun()));

String description = form.getDescription();
if (description == null || description.length() == 0)
if (description == null || description.isEmpty())
description = _run.getDescription();

RenameBean bean = new RenameBean();
bean.run = _run;
bean.description = description;
bean.returnURL = _returnURL;
bean.returnUrl = _returnUrl;

getPageConfig().setFocusId("description");

Expand All @@ -7419,13 +7419,13 @@ public boolean handlePost(RenameForm form, BindException errors) throws BatchVal
@Override
public URLHelper getSuccessURL(RenameForm form)
{
return form.getReturnURLHelper();
return form.getReturnUrlHelper();
}

@Override
public void addNavTrail(NavTree root)
{
addRunNavTrail(root, _run, _returnURL, "Rename Run", getPageConfig(), null);
addRunNavTrail(root, _run, _returnUrl, "Rename Run", getPageConfig(), null);
}
}

Expand All @@ -7434,7 +7434,7 @@ public static class RenameBean
{
public TargetedMSRun run;
public String description;
public URLHelper returnURL;
public URLHelper returnUrl;
}

private void addRunNavTrail(NavTree root, TargetedMSRun run, URLHelper runURL, String title, PageConfig page, String helpTopic)
Expand Down
2 changes: 1 addition & 1 deletion src/org/labkey/targetedms/TargetedMSFolderType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public List<NavTree> getExtraSetupSteps(Container c)
{
ActionURL fileRootsUrl = new ActionURL("admin", "fileRootsStandAlone", c)
.addParameter("folderSetup", true)
.addReturnURL(setupUrl);
.addReturnUrl(setupUrl);
extraSteps.add(new NavTree("Change File Root", fileRootsUrl));
}
extraSteps.add(new NavTree(TargetedMSController.CONFIGURE_TARGETED_MS_FOLDER, setupUrl));
Expand Down
2 changes: 1 addition & 1 deletion src/org/labkey/targetedms/query/QCFolderDisplayColumnFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public void renderGridCellContents(RenderContext ctx, Writer out) throws IOExcep
{
url.addParameter("RunId", currentRunId.toString());
}
url.addReturnURL(ctx.getViewContext().getActionURL());
url.addReturnUrl(ctx.getViewContext().getActionURL());
sb.append("<div><a href=\"")
.append(PageFlowUtil.filter(url))
.append("\"")
Expand Down
4 changes: 2 additions & 2 deletions src/org/labkey/targetedms/view/renameRun.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
RenameBean bean = ((JspView<RenameBean>) HttpView.currentView()).getModelBean();
%>
<labkey:form action="<%=urlFor(RenameRunAction.class)%>" method="post" layout="horizontal">
<%=generateReturnUrlFormField(bean.returnURL)%>
<%=generateReturnUrlFormField(bean.returnUrl)%>
<labkey:input type="hidden" name="run" value="<%=bean.run.getRunId()%>"/>
<labkey:input type="text" size="70" name="description" id="description" label="Name" value="<%=bean.description%>"/>
<%= button("Rename").submit(true) %> <%= button("Cancel").href(bean.returnURL) %>
<%= button("Rename").submit(true) %> <%= button("Cancel").href(bean.returnUrl) %>
</labkey:form>