Skip to content

Complete migration from srcURL and returnURL to returnUrl - #6407

Merged
labkey-jeckels merged 2 commits into
developfrom
fb_returnUrl
Mar 5, 2025
Merged

Complete migration from srcURL and returnURL to returnUrl#6407
labkey-jeckels merged 2 commits into
developfrom
fb_returnUrl

Conversation

@labkey-jeckels

Copy link
Copy Markdown
Contributor

Rationale

In 2021 we made a major push to use returnUrl consistently instead of srcURL or returnURL. We can finish the job.

Issue 7580: inconsistent use of returnUrl parameter

Changes

  • Change everything to returnUrl and get rid of code checking for old versions of the parameters

Comment threadapi/src/org/labkey/api/action/ReturnUrlForm.java

// when we convert code to use ReturnUrlForm we may leave behind bookmarks using "returnURL"
@Deprecated
public ReturnURLString getReturnURL()

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we delete this and the setter?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Deleted

<h3>OLAP Cube definitions in this folder:</h3>
<p>
<%=link("create new", new ActionURL(OlapController.CreateDefinitionAction.class, getContainer()).addReturnURL(getActionURL().clone())).id("create-cube-definition")%>
<%=link("create new", new ActionURL(OlapController.CreateDefinitionAction.class, getContainer()).addReturnUrl(getActionURL().clone())).id("create-cube-definition")%>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do all these methods really need to clone() the getActionURL()?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope. Removed

}
%>
<%=link("create new", new ActionURL(OlapController.CreateDefinitionAction.class, getContainer()).addReturnURL(getActionURL().clone()))%>
<%=link("create new", new ActionURL(OlapController.CreateDefinitionAction.class, getContainer()).addReturnUrl(getActionURL().clone()))%>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clone()?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@labkey-jeckels@labkey-adam