Merge pull request #53 from jenkinsci/jenkins-35150

[JENKINS-35150] We can be more forgiving of users with misconfigured HTTPS front-ends
jenkinsci · May 27, 2016 · ae6cf30 · ae6cf30
2 parents e2bd270 + 3df3260
commit ae6cf30
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/com/cloudbees/plugins/credentials/CredentialsSelectHelper.java b/src/main/java/com/cloudbees/plugins/credentials/CredentialsSelectHelper.java
@@ -215,8 +215,7 @@ public StoreItem(CredentialsStore store) {
             this.url = token == null
                     ? null
                     : String.format(
-                            "%sdescriptor/%s/resolver/%s/provider/%s/context/%s",
-                            Jenkins.getActiveInstance().getRootUrlFromRequest(),
+                            "descriptor/%s/resolver/%s/provider/%s/context/%s",
                             CredentialsSelectHelper.class.getName(),
                             Util.rawEncode(resolver),
                             Util.rawEncode(provider),

diff --git a/src/main/resources/lib/credentials/select.jelly b/src/main/resources/lib/credentials/select.jelly
@@ -87,7 +87,8 @@
             <div class="bd">
             <ul class="first-of-type">
             <j:forEach var="storeItem" items="${storeItems}">
-              <li class="yuimenuitem" data-url="${storeItem.url}/dialog" disabled="${storeItem.enabled?null:'disabled'}">
+              <li class="yuimenuitem" data-url="${request.contextPath}/${storeItem.url}/dialog"
+                  disabled="${storeItem.enabled?null:'disabled'}">
                 <span class="yuimenuitemlabel" tooltip="${storeItem.description}">
                 <l:icon class="${storeItem.iconClassName} icon-sm"/>
                 ${storeItem.displayName}