Skip to content

Simplifying snippetizer link URL construction #217

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Simplifying snippetizer link URL construction #217

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f511073
Simplifying snippetizer link URL construction
abayer Apr 2, 2018
09559d9
Use StringUtils while concatenating url
bitwiseman Jun 20, 2019
af2dcd1
Merge remote-tracking branch 'jenkinsci/master' into snippetizerlink-…
bitwiseman Jun 20, 2019
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
24 changes: 2 additions & 22 deletions src/main/java/org/jenkinsci/plugins/workflow/cps/SnippetizerLink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,32 +75,12 @@ public final String getDisplayUrl() {

StaplerRequest req = Stapler.getCurrentRequest();
if (req == null) {
return u;
throw new IllegalStateException("Can't get display URL without Stapler context.");
}

Item i = req.findAncestorObject(Item.class);

StringBuilder toAppend = new StringBuilder();

toAppend.append(req.getContextPath());

if (!req.getContextPath().endsWith("/")) {
toAppend.append("/");
}

if (i == null) {
toAppend.append(u);
} else {
toAppend.append(i.getUrl());

if (!i.getUrl().endsWith("/")) {
toAppend.append("/");
}

toAppend.append(u);
}

return toAppend.toString();
return req.getContextPath() + '/' + (i == null ? "" : i.getUrl()) + u;
Copy link
Member

@jglick jglick Apr 5, 2018

Choose a reason for hiding this comment

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

I assume you manually tested both cases here?

Copy link
Member

@svanoort svanoort Apr 5, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

Wait, why did we remove the check for if the context path has a '/' on it? We had an actual stage view bug that resulted from a similar issue.

Edit: even if it "shouldn't" happen it's a harmless check.

}

/**
Expand Down