FIXED JENKINS-15887 "Disable Project" button breaks Free style project

pages.
jenkinsci · Nov 21, 2012 · d9b23a2 · d9b23a2
1 parent 921d85f
commit d9b23a2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/changelog.html b/changelog.html
@@ -83,6 +83,10 @@
   <li class=bug>
     Maven2 job fails when using maven-failsafe-plugin
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15865">issue 15865</a>)
+  <li class=bug>
+    "Disable Project" button breaks Free style project pages.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15887">issue 15887</a>)
+
 
 </ul>
 </div><!--=TRUNK-END=-->

diff --git a/core/src/main/resources/hudson/model/AbstractProject/main.jelly b/core/src/main/resources/hudson/model/AbstractProject/main.jelly
@@ -25,12 +25,13 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
-  <p:projectActionFloatingBox />
 
   <j:if test="${it.supportsMakeDisabled()}">
     <st:include page="makeDisabled.jelly" />
   </j:if>
 
+  <p:projectActionFloatingBox />
+
   <table style="margin-top: 1em; margin-left:1em;">
 
     <j:forEach var="act" items="${it.prominentActions}">