Merge pull request #2692 from daniel-beck/JENKINS-38175

[FIX JENKINS-38175] Fix various ManagementLink related bugs
jenkinsci · Jan 8, 2017 · f7ef77b · f7ef77b
2 parents 7b51d56 + c9b878f
commit f7ef77b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/core/src/main/java/jenkins/management/ReloadLink.java b/core/src/main/java/jenkins/management/ReloadLink.java
@@ -56,5 +56,9 @@ public String getUrlName() {
     @Override public boolean getRequiresConfirmation() {
         return true;
     }
-
+
+    @Override
+    public boolean getRequiresPOST() {
+        return true;
+    }
 }
diff --git a/core/src/main/resources/jenkins/model/Jenkins/manage.jelly b/core/src/main/resources/jenkins/model/Jenkins/manage.jelly
@@ -32,15 +32,15 @@ THE SOFTWARE.
     <!-- table to show a map -->
     <d:tag name="feature">
       <j:set var="iconUrl" value="${icon.startsWith('/') ? resURL+icon : imagesURL+'/48x48/'+icon}"/>
-      ${taskTags!=null and attrs.contextMenu!='false' ? taskTags.add(href,iconUrl,title,requiresConfirmation,requiresConfirmation) : null}
+      ${taskTags!=null and attrs.contextMenu!='false' ? taskTags.add(href,iconUrl,title,post,requiresConfirmation) : null}
       <!-- TODO summary.jelly should be modified to accept requiresConfirmation so the icon link can be included -->
       <j:set var="_href" value="${href}"/>
       <t:summary icon="${icon}"
-                 href="${requiresConfirmation ? null : href}" iconOnly="true">
+                 href="${requiresConfirmation || post ? null : href}" iconOnly="true">
         <div class="link">
           <j:choose>
             <j:when test="${requiresConfirmation}">
-              <l:confirmationLink href="${_href}" post="true" message="${%are.you.sure(title)}">${title}</l:confirmationLink>
+              <l:confirmationLink href="${_href}" post="${post}" message="${%are.you.sure(title)}">${title}</l:confirmationLink>
             </j:when>
             <j:otherwise>
               <f:link href="${_href}" post="${post}">${title}</f:link>