Merge pull request #515 from jglick/JENKINS-14325

JENKINS-14325: CCE & missing GUI when using jobs inside folders
jenkinsci · Jul 10, 2012 · 788028f · 788028f
2 parents 051b001 + ae3dac8
commit 788028f
Show file tree

Hide file tree

Showing 67 changed files with 186 additions and 179 deletions.
diff --git a/changelog.html b/changelog.html
@@ -55,6 +55,9 @@
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
+  <li class=bug>
+    Enable/disable GUI for jobs either did not appear, or threw exceptions, for jobs inside folders
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-14325">issue 14325</a>)
   <li class=bug>
       <code>NullPointerException</code> from <code>UnlabeldLoadStatistics</code> <i>[sic]</i>
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-14330">issue 14330</a>)

diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java
@@ -620,6 +620,17 @@ public void makeDisabled(boolean b) throws IOException {
         save();
     }
 
+    /**
+     * Specifies whether this project may be disabled by the user.
+     * By default, it can be only if this is a {@link TopLevelItem};
+     * would be false for matrix configurations, etc.
+     * @return true if the GUI should allow {@link #doDisable} and the like
+     * @since 1.475
+     */
+    public boolean supportsMakeDisabled() {
+        return this instanceof TopLevelItem;
+    }
+
     public void disable() throws IOException {
         makeDisabled(true);
     }

diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index.jelly b/core/src/main/resources/hudson/matrix/MatrixProject/index.jelly
@@ -33,27 +33,7 @@ THE SOFTWARE.
       </j:if>
       <t:editableDescription permission="${it.CONFIGURE}"/>
 
-      <j:choose>
-          <j:when test="${it.disabled}">
-            <div class="warning">
-              <form method="post" action="enable">
-                ${%This project is currently disabled}
-                <l:hasPermission permission="${it.CONFIGURE}">
-                  <f:submit value="${%Enable}" />
-                </l:hasPermission>
-              </form>
-            </div>
-          </j:when>
-          <j:otherwise>
-              <div align="right">
-               <form method="post" action="disable">
-                 <l:hasPermission permission="${it.CONFIGURE}">
-                   <f:submit value="${%Disable Project}" />
-                 </l:hasPermission>
-               </form>
-               </div>
-             </j:otherwise>
-      </j:choose>
+      <st:include page="makeDisabled.jelly" />
 
       <st:include page="ajaxMatrix.jelly" />
 

diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_cs.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_cs.properties
@@ -20,5 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Disable\ Project=Vypnout projekt
 Project=Projekt
diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_da.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_da.properties
@@ -20,6 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-This\ project\ is\ currently\ disabled=Dette projekt er for nuv\u00e6rende sl\u00e5et fra
-Enable=Sl\u00e5 til
 Project=Projekt
diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_de.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_de.properties
@@ -22,6 +22,3 @@
 
 Latest\ Test\ Result=Aktuelle Testergebnisse
 Project=Projekt
-Enable=Aktivieren
-This\ project\ is\ currently\ disabled=Dieses Projekt ist momentan deaktiviert.
-Disable\ Project=Projekt deaktivieren
diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_es.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_es.properties
@@ -21,8 +21,5 @@
 # THE SOFTWARE.
 
 Project=Proyecto
-Disable\ Project=Desactivar el proyecto
-This\ project\ is\ currently\ disabled=Este proyecto está desactivado
-Enable=Activar
-Latest\ Test\ Result=Último resultado de test
+Latest\ Test\ Result=\u00daltimo resultado de test
 Project\ name=Nombre de proyecto
diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_fi.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_fi.properties
@@ -20,5 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Disable\ Project=Poista k\u00E4yt\u00F6st\u00E4
 Project=Projekti
diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_fr.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_fr.properties
@@ -20,8 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Disable\ Project=D\u00E9sactiver le projet
-Enable=Activer
-Latest\ Test\ Result=Derniers r\u00E9sultats de test
+Latest\ Test\ Result=Derniers r\u00e9sultats de test
 Project=projet
-This\ project\ is\ currently\ disabled=Ce projet est d\u00E9sactiv\u00E9
diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_it.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_it.properties
@@ -20,5 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Disable\ Project=Disabilita Progetto
 Project=Progetto
diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_ja.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_ja.properties
@@ -21,8 +21,5 @@
 # THE SOFTWARE.
 
 Project=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
-This\ project\ is\ currently\ disabled=\u73fe\u5728\u3001\u3053\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306f\u7121\u52b9\u3067\u3059\u3002
-Enable=\u6709\u52b9\u5316
-Disable\ Project=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u7121\u52b9\u5316
 Project\ name=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u540d
 Latest\ Test\ Result=\u6700\u65b0\u306e\u30c6\u30b9\u30c8\u7d50\u679c
diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_pl.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_pl.properties
@@ -20,7 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Disable\ Project=Wy\u0142\u0105cz projekt
-Enable=Aktywuj
 Project=Projekt
-This\ project\ is\ currently\ disabled=Projekt jest nieaktywny
diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_ru.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_ru.properties
@@ -20,7 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Disable\ Project=\u041E\u0442\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u043F\u0440\u043E\u0435\u043A\u0442
-Enable=\u0412\u043A\u043B\u044E\u0447\u0438\u0442\u044C
 Project=\u041f\u0440\u043e\u0435\u043a\u0442
-This\ project\ is\ currently\ disabled=\u042D\u0442\u043E\u0442 \u043F\u0440\u043E\u0435\u043A\u0442 \u0441\u0435\u0439\u0447\u0430\u0441 \u043E\u0442\u043A\u043B\u044E\u0447\u0435\u043D.
diff --git a/core/src/main/resources/hudson/matrix/MatrixProject/index_zh_CN.properties b/core/src/main/resources/hudson/matrix/MatrixProject/index_zh_CN.properties
@@ -20,5 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Disable\ Project=\u7981\u7528\u9879\u76EE
-Project=\u9879\u76EE
+Project=\u9879\u76ee
diff --git a/core/src/main/resources/hudson/model/AbstractProject/main.jelly b/core/src/main/resources/hudson/model/AbstractProject/main.jelly
@@ -27,6 +27,10 @@ THE SOFTWARE.
 <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>
+
   <table style="margin-top: 1em; margin-left:1em;">
 
     <j:forEach var="act" items="${it.prominentActions}">

diff --git a/core/src/main/resources/hudson/model/AbstractProject/makeDisabled.jelly b/core/src/main/resources/hudson/model/AbstractProject/makeDisabled.jelly
@@ -0,0 +1,48 @@
+<!--
+The MIT License
+
+Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Erik Ramfelt, Tom Huybrechts, id:cactusman
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+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">
+  <j:choose>
+    <j:when test="${it.disabled}">
+      <div class="warning">
+        <form method="post" action="enable">
+          ${%This project is currently disabled}
+          <l:hasPermission permission="${it.CONFIGURE}">
+            <f:submit value="${%Enable}" />
+          </l:hasPermission>
+        </form>
+      </div>
+    </j:when>
+    <j:otherwise>
+      <div align="right">
+        <form method="post" action="disable">
+          <l:hasPermission permission="${it.CONFIGURE}">
+            <f:submit value="${%Disable Project}" />
+          </l:hasPermission>
+        </form>
+      </div>
+    </j:otherwise>
+  </j:choose>
+</j:jelly>
diff --git a/...rces/hudson/model/Job/index_bg.properties → ...bstractProject/makeDisabled_bg.properties b/...rces/hudson/model/Job/index_bg.properties → ...bstractProject/makeDisabled_bg.properties
diff --git a/...rces/hudson/model/Job/index_ca.properties → ...bstractProject/makeDisabled_ca.properties b/...rces/hudson/model/Job/index_ca.properties → ...bstractProject/makeDisabled_ca.properties
diff --git a/...rces/hudson/model/Job/index_cs.properties → ...bstractProject/makeDisabled_cs.properties b/...rces/hudson/model/Job/index_cs.properties → ...bstractProject/makeDisabled_cs.properties
diff --git a/...rces/hudson/model/Job/index_da.properties → ...bstractProject/makeDisabled_da.properties b/...rces/hudson/model/Job/index_da.properties → ...bstractProject/makeDisabled_da.properties
diff --git a/...rces/hudson/model/Job/index_de.properties → ...bstractProject/makeDisabled_de.properties b/...rces/hudson/model/Job/index_de.properties → ...bstractProject/makeDisabled_de.properties
diff --git a/.../maven/MavenModuleSet/index_sl.properties → ...bstractProject/makeDisabled_es.properties b/.../maven/MavenModuleSet/index_sl.properties → ...bstractProject/makeDisabled_es.properties
@@ -20,4 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Disable\ Project=Onemogo\u010Di Projekt
+This\ project\ is\ currently\ disabled=Este projecto est\u00e1 desactivado actualmente
+Enable=Activar
+Disable\ Project=Desactivar el Proyecto
diff --git a/...rces/hudson/model/Job/index_fi.properties → ...bstractProject/makeDisabled_fi.properties b/...rces/hudson/model/Job/index_fi.properties → ...bstractProject/makeDisabled_fi.properties
diff --git a/...rces/hudson/model/Job/index_fr.properties → ...bstractProject/makeDisabled_fr.properties b/...rces/hudson/model/Job/index_fr.properties → ...bstractProject/makeDisabled_fr.properties
diff --git a/...rces/hudson/model/Job/index_hu.properties → ...bstractProject/makeDisabled_hu.properties b/...rces/hudson/model/Job/index_hu.properties → ...bstractProject/makeDisabled_hu.properties
diff --git a/...rces/hudson/model/Job/index_is.properties → ...bstractProject/makeDisabled_is.properties b/...rces/hudson/model/Job/index_is.properties → ...bstractProject/makeDisabled_is.properties
diff --git a/...rces/hudson/model/Job/index_it.properties → ...bstractProject/makeDisabled_it.properties b/...rces/hudson/model/Job/index_it.properties → ...bstractProject/makeDisabled_it.properties
diff --git a/core/src/main/resources/hudson/model/AbstractProject/makeDisabled_ja.properties b/core/src/main/resources/hudson/model/AbstractProject/makeDisabled_ja.properties
@@ -0,0 +1,25 @@
+# The MIT License
+# 
+# Copyright (c) 2004-2012, Sun Microsystems, Inc., Kohsuke Kawaguchi, Seiji Sogabe, id:cactusman
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+This\ project\ is\ currently\ disabled=\u73fe\u5728\u3001\u3053\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306f\u7121\u52b9\u3067\u3059\u3002
+Enable=\u6709\u52b9\u5316
+Disable\ Project=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u7121\u52b9\u5316
diff --git a/...rces/hudson/model/Job/index_ko.properties → ...bstractProject/makeDisabled_ko.properties b/...rces/hudson/model/Job/index_ko.properties → ...bstractProject/makeDisabled_ko.properties
diff --git a/...rces/hudson/model/Job/index_lv.properties → ...bstractProject/makeDisabled_lv.properties b/...rces/hudson/model/Job/index_lv.properties → ...bstractProject/makeDisabled_lv.properties
diff --git a/...s/hudson/model/Job/index_nb_NO.properties → ...ractProject/makeDisabled_nb_NO.properties b/...s/hudson/model/Job/index_nb_NO.properties → ...ractProject/makeDisabled_nb_NO.properties
diff --git a/...ven/MavenModuleSet/index_zh_TW.properties → ...bstractProject/makeDisabled_nl.properties b/...ven/MavenModuleSet/index_zh_TW.properties → ...bstractProject/makeDisabled_nl.properties
@@ -1,17 +1,17 @@
 # The MIT License
-#
-# Copyright (c) 2004-2010, Sun Microsystems, Inc.
-#
+# 
+# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, id:sorokh
+# 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
-#
+# 
 # The above copyright notice and this permission notice shall be included in
 # all copies or substantial portions of the Software.
-#
+# 
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -20,6 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-Disable\ Project=\u95DC\u9589\u5C08\u6848
-Enable=\u555F\u7528
-This\ project\ is\ currently\ disabled=\u672C\u5C08\u6848\u76EE\u524D\u662F\u505C\u7528\u7684\u3002
+Disable\ Project=Deactiveer project
+Enable=Activeren
+This\ project\ is\ currently\ disabled=Dit project is gedeactiveerd
diff --git a/...rces/hudson/model/Job/index_pl.properties → ...bstractProject/makeDisabled_pl.properties b/...rces/hudson/model/Job/index_pl.properties → ...bstractProject/makeDisabled_pl.properties
diff --git a/...s/hudson/model/Job/index_pt_BR.properties → ...ractProject/makeDisabled_pt_BR.properties b/...s/hudson/model/Job/index_pt_BR.properties → ...ractProject/makeDisabled_pt_BR.properties
diff --git a/...rces/hudson/model/Job/index_ro.properties → ...bstractProject/makeDisabled_ro.properties b/...rces/hudson/model/Job/index_ro.properties → ...bstractProject/makeDisabled_ro.properties
diff --git a/core/src/main/resources/hudson/model/AbstractProject/makeDisabled_ru.properties b/core/src/main/resources/hudson/model/AbstractProject/makeDisabled_ru.properties
@@ -0,0 +1,25 @@
+# The MIT License
+# 
+# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Mike Salnikov
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+Disable\ Project=\u0412\u044b\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u043f\u0440\u043e\u0435\u043a\u0442
+Enable=\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c
+This\ project\ is\ currently\ disabled=\u042d\u0442\u043e\u0442 \u043f\u0440\u043e\u0435\u043a\u0442 \u0432\u0440\u0435\u043c\u0435\u043d\u043d\u043e \u0432\u044b\u043a\u043b\u044e\u0447\u0435\u043d
diff --git a/...rces/hudson/model/Job/index_sk.properties → ...bstractProject/makeDisabled_sk.properties b/...rces/hudson/model/Job/index_sk.properties → ...bstractProject/makeDisabled_sk.properties
diff --git a/...s/hudson/model/Job/index_sv_SE.properties → ...ractProject/makeDisabled_sv_SE.properties b/...s/hudson/model/Job/index_sv_SE.properties → ...ractProject/makeDisabled_sv_SE.properties
diff --git a/core/src/main/resources/hudson/model/AbstractProject/makeDisabled_tr.properties b/core/src/main/resources/hudson/model/AbstractProject/makeDisabled_tr.properties
@@ -0,0 +1,24 @@
+# The MIT License
+# 
+# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Oguz Dag
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+Disable\ Project=Projeyi devre d\u0131\u015f\u0131 b\u0131rak
+This\ project\ is\ currently\ disabled=Bu proje \u015fimdilik devre d\u0131\u015f\u0131
diff --git a/...s/hudson/model/Job/index_zh_CN.properties → ...ractProject/makeDisabled_zh_CN.properties b/...s/hudson/model/Job/index_zh_CN.properties → ...ractProject/makeDisabled_zh_CN.properties
diff --git a/...s/hudson/model/Job/index_zh_TW.properties → ...ractProject/makeDisabled_zh_TW.properties b/...s/hudson/model/Job/index_zh_TW.properties → ...ractProject/makeDisabled_zh_TW.properties
diff --git a/core/src/main/resources/hudson/model/Job/index.jelly b/core/src/main/resources/hudson/model/Job/index.jelly
@@ -33,30 +33,6 @@ THE SOFTWARE.
       </j:if>
       <t:editableDescription permission="${it.CONFIGURE}"/>
 
-      <j:if test="${it.parent == app}">
-          <j:choose>
-              <j:when test="${it.disabled}">
-                <div class="warning">
-                  <form method="post" action="enable">
-                    ${%This project is currently disabled}
-                    <l:hasPermission permission="${it.CONFIGURE}">
-                      <f:submit value="${%Enable}" />
-                    </l:hasPermission>
-                  </form>
-                </div>
-                </j:when>
-                <j:otherwise>
-                 <div align="right">
-                  <form method="post" action="disable">
-                    <l:hasPermission permission="${it.CONFIGURE}">
-                      <f:submit value="${%Disable Project}" />
-                    </l:hasPermission>
-                  </form>
-                  </div>
-               </j:otherwise>
-          </j:choose>
-      </j:if>
-
       <st:include page="jobpropertysummaries.jelly" />
       <!-- inject main part here -->
       <st:include page="main.jelly" />

diff --git a/core/src/main/resources/hudson/model/Job/index_es.properties b/core/src/main/resources/hudson/model/Job/index_es.properties
@@ -20,7 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-This\ project\ is\ currently\ disabled=Este projecto está desactivado actualmente
-Enable=Activar
-Disable\ Project=Desactivar el Proyecto
 Project\ name=Nombre del Proyecto
diff --git a/core/src/main/resources/hudson/model/Job/index_ja.properties b/core/src/main/resources/hudson/model/Job/index_ja.properties
@@ -20,7 +20,4 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-This\ project\ is\ currently\ disabled=\u73fe\u5728\u3001\u3053\u306e\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306f\u7121\u52b9\u3067\u3059\u3002
-Enable=\u6709\u52b9\u5316
-Disable\ Project=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u306e\u7121\u52b9\u5316
 Project\ name=\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u540d
diff --git a/core/src/main/resources/hudson/model/Job/index_nl.properties b/core/src/main/resources/hudson/model/Job/index_nl.properties
@@ -21,10 +21,7 @@
 # THE SOFTWARE.
 
 Permalinks=Permanente referenties
-Disable\ Project=Deactiveer project
-Enable=Activeren
 Last\ build=Laatste bouwpoging
 Last\ stable\ build=Laatste stabiele bouwpoging
 Last\ successful\ build=Laatste succesvolle bouwpoging
 Last\ failed\ build=Laatst gefaalde bouwpoging
-This\ project\ is\ currently\ disabled=Dit project is gedeactiveerd
diff --git a/core/src/main/resources/hudson/model/Job/index_ru.properties b/core/src/main/resources/hudson/model/Job/index_ru.properties
@@ -21,10 +21,7 @@
 # THE SOFTWARE.
 
 Permalinks=\u041f\u043e\u0441\u0442\u043e\u044f\u043d\u043d\u044b\u0435 \u0441\u0441\u044b\u043b\u043a\u0438
-Disable\ Project=\u0412\u044B\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u043F\u0440\u043E\u0435\u043A\u0442
-Enable=\u0412\u043A\u043B\u044E\u0447\u0438\u0442\u044C
 Last\ build=\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u044f\u044f \u0441\u0431\u043e\u0440\u043a\u0430
 Last\ stable\ build=\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u044f\u044f \u0441\u0442\u0430\u0431\u0438\u043b\u044c\u043d\u0430\u044f \u0441\u0431\u043e\u0440\u043a\u0430
 Last\ successful\ build=\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u044f\u044f \u0443\u0441\u043f\u0435\u0448\u043d\u0430\u044f \u0441\u0431\u043e\u0440\u043a\u0430
 Last\ failed\ build=\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u044f\u044f \u043f\u0440\u043e\u0432\u0430\u043b\u0438\u0432\u0448\u0430\u044f\u0441\u044f \u0441\u0431\u043e\u0440\u043a\u0430
-This\ project\ is\ currently\ disabled=\u042d\u0442\u043e\u0442 \u043f\u0440\u043e\u0435\u043a\u0442 \u0432\u0440\u0435\u043c\u0435\u043d\u043d\u043e \u0432\u044b\u043a\u043b\u044e\u0447\u0435\u043d
diff --git a/core/src/main/resources/hudson/model/Job/index_tr.properties b/core/src/main/resources/hudson/model/Job/index_tr.properties
@@ -21,9 +21,7 @@
 # THE SOFTWARE.
 
 Permalinks=Permalinks
-Disable\ Project=Projeyi devre d\u0131\u015F\u0131 b\u0131rak
 Last\ build=Son yap\u0131land\u0131rma
 Last\ stable\ build=Son stabil yap\u0131land\u0131rma
 Last\ successful\ build=Son ba\u015far\u0131l\u0131 yap\u0131land\u0131rma
 Last\ failed\ build=Son ba\u015far\u0131s\u0131z yap\u0131land\u0131rma
-This\ project\ is\ currently\ disabled=Bu proje \u015fimdilik devre d\u0131\u015f\u0131