Skip to content
Permalink
Browse files
[FIXED JENKINS-14325] CCE & missing GUI when using jobs inside folders.
Introduced AbstractProject.supportsMakeDisabled rather than using trick of checking for parent instanceof Jenkins.
Extracted common GUI into makeDisabled.jelly, with accompanying I18N refactoring.
Also moved all this into AbstractProject, where the relevant methods are defined, rather than Job where they are not.
Originally-Committed-As: c91584ff21e221201416b04a48331b253077a3d3
  • Loading branch information
jglick committed Jul 5, 2012
1 parent f0db102 commit 465ae268bdc01ec65ad1eb2b895f1e82b59c4d11
Showing with 36 additions and 132 deletions.
  1. +5 −0 src/main/java/hudson/maven/MavenModule.java
  2. +1 −21 src/main/resources/hudson/maven/MavenModuleSet/index.jelly
  3. +2 −3 src/main/resources/hudson/maven/MavenModuleSet/index_cs.properties
  4. +0 −3 src/main/resources/hudson/maven/MavenModuleSet/index_da.properties
  5. +1 −4 src/main/resources/hudson/maven/MavenModuleSet/index_de.properties
  6. +2 −5 src/main/resources/hudson/maven/MavenModuleSet/index_es.properties
  7. +2 −3 src/main/resources/hudson/maven/MavenModuleSet/index_fi.properties
  8. +4 −6 src/main/resources/hudson/maven/MavenModuleSet/index_fr.properties
  9. +2 −3 src/main/resources/hudson/maven/MavenModuleSet/index_he.properties
  10. +3 −4 src/main/resources/hudson/maven/MavenModuleSet/index_hu.properties
  11. +0 −1 src/main/resources/hudson/maven/MavenModuleSet/index_it.properties
  12. +0 −4 src/main/resources/hudson/maven/MavenModuleSet/index_ja.properties
  13. +1 −2 src/main/resources/hudson/maven/MavenModuleSet/index_lv.properties
  14. +1 −2 src/main/resources/hudson/maven/MavenModuleSet/index_nb_NO.properties
  15. +0 −1 src/main/resources/hudson/maven/MavenModuleSet/index_nl.properties
  16. +2 −3 src/main/resources/hudson/maven/MavenModuleSet/index_pl.properties
  17. +0 −1 src/main/resources/hudson/maven/MavenModuleSet/index_pt_BR.properties
  18. +1 −4 src/main/resources/hudson/maven/MavenModuleSet/index_ru.properties
  19. +0 −23 src/main/resources/hudson/maven/MavenModuleSet/index_sl.properties
  20. +1 −2 src/main/resources/hudson/maven/MavenModuleSet/index_sv_SE.properties
  21. +4 −5 src/main/resources/hudson/maven/MavenModuleSet/index_uk.properties
  22. +4 −7 src/main/resources/hudson/maven/MavenModuleSet/index_zh_CN.properties
  23. +0 −25 src/main/resources/hudson/maven/MavenModuleSet/index_zh_TW.properties
@@ -166,6 +166,11 @@ public boolean supportsLogRotator() {
return false;
}

@Override
public boolean supportsMakeDisabled() {
return false;
}

@Override
public boolean isBuildable() {
// not buildable if the parent project is disabled
@@ -31,27 +31,7 @@ THE SOFTWARE.
<h1>${it.pronoun} ${it.displayName}</h1>
<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" />

<p:projectActionFloatingBox />

@@ -20,6 +20,5 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

Disable\ Project=Deaktivovat projekt
Latest\ Test\ Result=Posledn\u00ED v\u00FDsledky test\u016F
Recent\ Changes=Posledn\u00ED zm\u011Bny
Latest\ Test\ Result=Posledn\u00ed v\u00fdsledky test\u016f
Recent\ Changes=Posledn\u00ed zm\u011bny
@@ -21,9 +21,6 @@
# THE SOFTWARE.

Latest\ Test\ Result=Seneste testmodul
Disable\ Project=Deaktiver projekt
Enable=Sl\u00e5 til
Workspace=Arbejdsomr\u00e5de
Last\ Successful\ Artifacts=Seneste succesfulde artifakter
This\ project\ is\ currently\ disabled=Dette projekt er for nuv\u00e6rende sl\u00e5et fra
Recent\ Changes=Nyelige \u00e6ndringer
@@ -21,9 +21,6 @@
# THE SOFTWARE.

Workspace=Arbeitsbereich
Recent\ Changes=Letzte Änderungen
Recent\ Changes=Letzte \u00c4nderungen
Latest\ Test\ Result=Letztes Testergebnis
Last\ Successful\ Artifacts=Letzte erfolgreiche Artefakte
Enable=Aktivieren
This\ project\ is\ currently\ disabled=Dieses Projekt ist momentan deaktiviert.
Disable\ Project=Projekt deaktivieren
@@ -22,8 +22,5 @@

Recent\ Changes=Cambios recientes
Workspace=Espacio de trabajo
Latest\ Test\ Result=Últimos resultados de tests
Last\ Successful\ Artifacts=Último artefacto correcto
Enable=Activar
This\ project\ is\ currently\ disabled=Este proyecto está desactivado
Disable\ Project=Desactivar este proyecto
Latest\ Test\ Result=\u00daltimos resultados de tests
Last\ Successful\ Artifacts=\u00daltimo artefacto correcto
@@ -20,7 +20,6 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

Disable\ Project=Ota projekti pois k\u00E4yt\u00F6st\u00E4
Last\ Successful\ Artifacts=Viimeinen onnistunut artifakti
Recent\ Changes=Viimeisimm\u00E4t muutokset
Workspace=Ty\u00F6tila
Recent\ Changes=Viimeisimm\u00e4t muutokset
Workspace=Ty\u00f6tila
@@ -20,10 +20,8 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

This\ project\ is\ currently\ disabled=Ce projet est actuellement d\u00E9sactiv\u00E9
This\ project\ is\ currently\ disabled=Ce projet est actuellement d\u00e9sactiv\u00e9
Workspace=Espace de travail
Recent\ Changes=Changements récents
Latest\ Test\ Result=Derniers résultats des tests
Disable\ Project=D\u00E9sactiver le projet
Enable=Activer
Last\ Successful\ Artifacts=Derniers artefacts construits avec succès
Recent\ Changes=Changements r\u00e9cents
Latest\ Test\ Result=Derniers r\u00e9sultats des tests
Last\ Successful\ Artifacts=Derniers artefacts construits avec succ\u00e8s
@@ -20,6 +20,5 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

Disable\ Project=\u05E0\u05E2\u05DC \u05E4\u05E8\u05D5\u05D9\u05E7\u05D8 \u05DE\u05E9\u05D9\u05DE\u05D5\u05E9
Recent\ Changes=\u05E9\u05D9\u05E0\u05D5\u05D9\u05D9\u05DD \u05D0\u05D7\u05E8\u05D5\u05E0\u05D9\u05DD
Workspace=\u05DE\u05E9\u05D8\u05D7 \u05E2\u05D1\u05D5\u05D3\u05D4
Recent\ Changes=\u05e9\u05d9\u05e0\u05d5\u05d9\u05d9\u05dd \u05d0\u05d7\u05e8\u05d5\u05e0\u05d9\u05dd
Workspace=\u05de\u05e9\u05d8\u05d7 \u05e2\u05d1\u05d5\u05d3\u05d4
@@ -20,7 +20,6 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

Disable\ Project=Projekt letilt\u00E1sa
Last\ Successful\ Artifacts=Utols\u00F3 Sikeres Artifact-ek
Recent\ Changes=\u00DAj V\u00E1ltoz\u00E1sok
Workspace=Munkater\u00FClet
Last\ Successful\ Artifacts=Utols\u00f3 Sikeres Artifact-ek
Recent\ Changes=\u00daj V\u00e1ltoz\u00e1sok
Workspace=Munkater\u00fclet
@@ -20,7 +20,6 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

Disable\ Project=Disabilita progetto
Last\ Successful\ Artifacts=Ultimi artifact con successo
Latest\ Test\ Result=Ultimo risultato tes
Recent\ Changes=Modifiche recenti
@@ -24,7 +24,3 @@ Workspace=\u30ef\u30fc\u30af\u30b9\u30da\u30fc\u30b9
Recent\ Changes=\u5909\u66f4\u5c65\u6b74
Latest\ Test\ Result=\u6700\u65b0\u306e\u30c6\u30b9\u30c8\u7d50\u679c
Last\ Successful\ Artifacts=\u6700\u65b0\u6210\u529f\u30d3\u30eb\u30c9\u306e\u6210\u679c\u7269
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

@@ -20,8 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

Disable\ Project=Atsl\u0113gt projektu
Last\ Successful\ Artifacts=P\u0113d\u0113jie veiksm\u012Bgie artefakti
Last\ Successful\ Artifacts=P\u0113d\u0113jie veiksm\u012bgie artefakti
Latest\ Test\ Result=Jaun\u0101kie testu rezult\u0101ti
Recent\ Changes=P\u0113d\u0113j\u0101s izmai\u0146as
Workspace=Darbavieta
@@ -20,8 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

Disable\ Project=Deaktiver prosjekt
Last\ Successful\ Artifacts=Siste feilfrie bygg
Latest\ Test\ Result=Siste testresultater
Recent\ Changes=Siste Forandringer
Workspace=Arbeidsomr\u00E5de
Workspace=Arbeidsomr\u00e5de
@@ -27,6 +27,5 @@ text= Gelieve <a href="build?delay=0sec">een nieuwe bouwpoging</a> te starten. O
Overview={0} Overzicht
Workspace=Werkplaats
Recent\ Changes=Recente veranderingen
Disable\ Project=Blokkeer project
Last\ Successful\ Artifacts=Laatste succesvolle artefacten
Latest\ Test\ Result=Laatste testresultaat
@@ -20,8 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

Disable\ Project=Wy\u0142\u0105cz projekt
Last\ Successful\ Artifacts=Ostatnie pomy\u015Blne artefakty
Latest\ Test\ Result=Ostatnie rezultaty test\u00F3w
Last\ Successful\ Artifacts=Ostatnie pomy\u015blne artefakty
Latest\ Test\ Result=Ostatnie rezultaty test\u00f3w
Recent\ Changes=Ostatnie zmiany
Workspace=Przestrze\u0144 robocza
@@ -23,5 +23,4 @@
Workspace=
Recent\ Changes=Mudan\u00e7as Recentes
Latest\ Test\ Result=\u00daltimo Resultado de Teste
Disable\ Project=Desabilitar o Projeto
Last\ Successful\ Artifacts=\u00daltimos Artefatos que obtiveram Sucesso
@@ -20,10 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

This\ project\ is\ currently\ disabled=\u042D\u0442\u043E\u0442 \u043F\u0440\u043E\u0435\u043A\u0442 \u043E\u0442\u043A\u043B\u044E\u0447\u0435\u043D
Workspace=\u0421\u0431\u043e\u0440\u043e\u0447\u043d\u0430\u044f \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u044f
Recent\ Changes=\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u0438\u0435 \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f
Disable\ Project=\u0417\u0430\u043F\u0440\u0435\u0442\u0438\u0442\u044C \u043F\u0440\u043E\u0435\u043A\u0442
Enable=\u0412\u043A\u043B\u044E\u0447\u0438\u0442\u044C
Last\ Successful\ Artifacts=\u0410\u0440\u0442\u0435\u0444\u0430\u043A\u0442\u044B \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0435\u0439 \u0443\u0441\u043F\u0435\u0448\u043D\u043E\u0439 \u0441\u0431\u043E\u0440\u043A\u0438
Last\ Successful\ Artifacts=\u0410\u0440\u0442\u0435\u0444\u0430\u043a\u0442\u044b \u043f\u043e\u0441\u043b\u0435\u0434\u043d\u0435\u0439 \u0443\u0441\u043f\u0435\u0448\u043d\u043e\u0439 \u0441\u0431\u043e\u0440\u043a\u0438
Latest\ Test\ Result=\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u0438\u0435 \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u044b \u0442\u0435\u0441\u0442\u043e\u0432

This file was deleted.

@@ -20,8 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

Disable\ Project=Inaktivera projekt
Last\ Successful\ Artifacts=Senast lyckade artifakt
Latest\ Test\ Result=Senaste testresultat
Recent\ Changes=Senaste F\u00F6r\u00E4ndringar
Recent\ Changes=Senaste F\u00f6r\u00e4ndringar
Workspace=Arbetsyta
@@ -20,8 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

Disable\ Project=\u0412\u0438\u043C\u043A\u043D\u0443\u0442\u0438 \u041F\u0440\u043E\u0435\u043A\u0442
Last\ Successful\ Artifacts=\u0410\u0440\u0442\u0435\u0444\u0430\u043A\u0442\u0438 \u043E\u0441\u0442\u0430\u043D\u043D\u044C\u043E\u0457 \u0443\u0441\u043F\u0456\u0448\u043D\u043E\u0457 \u043F\u043E\u0431\u0443\u0434\u043E\u0432\u0438
Latest\ Test\ Result=\u041E\u0441\u0442\u0430\u043D\u043D\u0456 \u0420\u0435\u0437\u0443\u043B\u044C\u0442\u0430\u0442\u0438 \u0422\u0435\u0441\u0442\u0456\u0432
Recent\ Changes=\u041E\u0441\u0442\u0430\u043D\u043D\u0456 \u0417\u043C\u0456\u043D\u0438
Workspace=\u0420\u043E\u0431\u043E\u0447\u0456 \u0444\u0430\u0439\u043B\u0438
Last\ Successful\ Artifacts=\u0410\u0440\u0442\u0435\u0444\u0430\u043a\u0442\u0438 \u043e\u0441\u0442\u0430\u043d\u043d\u044c\u043e\u0457 \u0443\u0441\u043f\u0456\u0448\u043d\u043e\u0457 \u043f\u043e\u0431\u0443\u0434\u043e\u0432\u0438
Latest\ Test\ Result=\u041e\u0441\u0442\u0430\u043d\u043d\u0456 \u0420\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u0438 \u0422\u0435\u0441\u0442\u0456\u0432
Recent\ Changes=\u041e\u0441\u0442\u0430\u043d\u043d\u0456 \u0417\u043c\u0456\u043d\u0438
Workspace=\u0420\u043e\u0431\u043e\u0447\u0456 \u0444\u0430\u0439\u043b\u0438
@@ -20,10 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

Disable\ Project=\u7981\u7528\u9879\u76EE
Enable=\u542F\u7528\u9879\u76EE
Last\ Successful\ Artifacts=\u6700\u7EC8\u6210\u529F\u6784\u5EFA
Latest\ Test\ Result=\u6700\u65B0\u6D4B\u8BD5\u7ED3\u679C
Recent\ Changes=\u6700\u65B0\u4FEE\u6539
This\ project\ is\ currently\ disabled=\u5F53\u524D\u9879\u76EE\u5DF2\u88AB\u7981\u7528
Workspace=\u5DE5\u4F5C\u533A
Last\ Successful\ Artifacts=\u6700\u7ec8\u6210\u529f\u6784\u5efa
Latest\ Test\ Result=\u6700\u65b0\u6d4b\u8bd5\u7ed3\u679c
Recent\ Changes=\u6700\u65b0\u4fee\u6539
Workspace=\u5de5\u4f5c\u533a

This file was deleted.

0 comments on commit 465ae26

Please sign in to comment.