[jenkinsci/jenkins] c91584: [FIXED JENKINS-14325] CCE & missing GUI when using...

Tue, 10 Jul 2012 11:58:19 -0700 

  Branch: refs/heads/master
  Home:   https://github.com/jenkinsci/jenkins
  Commit: c91584ff21e221201416b04a48331b253077a3d3
      
https://github.com/jenkinsci/jenkins/commit/c91584ff21e221201416b04a48331b253077a3d3
  Author: Jesse Glick <[email protected]>
  Date:   2012-07-05 (Thu, 05 Jul 2012)

  Changed paths:
    M changelog.html
    M core/src/main/java/hudson/matrix/MatrixConfiguration.java
    M core/src/main/java/hudson/model/AbstractProject.java
    M core/src/main/resources/hudson/matrix/MatrixProject/index.jelly
    M core/src/main/resources/hudson/matrix/MatrixProject/index_cs.properties
    M core/src/main/resources/hudson/matrix/MatrixProject/index_da.properties
    M core/src/main/resources/hudson/matrix/MatrixProject/index_de.properties
    M core/src/main/resources/hudson/matrix/MatrixProject/index_es.properties
    M core/src/main/resources/hudson/matrix/MatrixProject/index_fi.properties
    M core/src/main/resources/hudson/matrix/MatrixProject/index_fr.properties
    M core/src/main/resources/hudson/matrix/MatrixProject/index_it.properties
    M core/src/main/resources/hudson/matrix/MatrixProject/index_ja.properties
    M core/src/main/resources/hudson/matrix/MatrixProject/index_pl.properties
    M core/src/main/resources/hudson/matrix/MatrixProject/index_ru.properties
    M core/src/main/resources/hudson/matrix/MatrixProject/index_zh_CN.properties
    M core/src/main/resources/hudson/model/AbstractProject/main.jelly
    A core/src/main/resources/hudson/model/AbstractProject/makeDisabled.jelly
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_bg.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_ca.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_cs.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_da.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_de.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_es.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_fi.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_fr.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_hu.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_is.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_it.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_ja.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_ko.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_lv.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_nb_NO.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_nl.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_pl.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_pt_BR.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_ro.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_ru.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_sk.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_sv_SE.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_tr.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_zh_CN.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_zh_TW.properties
    M core/src/main/resources/hudson/model/Job/index.jelly
    R core/src/main/resources/hudson/model/Job/index_bg.properties
    R core/src/main/resources/hudson/model/Job/index_ca.properties
    R core/src/main/resources/hudson/model/Job/index_cs.properties
    R core/src/main/resources/hudson/model/Job/index_da.properties
    R core/src/main/resources/hudson/model/Job/index_de.properties
    M core/src/main/resources/hudson/model/Job/index_es.properties
    R core/src/main/resources/hudson/model/Job/index_fi.properties
    R core/src/main/resources/hudson/model/Job/index_fr.properties
    R core/src/main/resources/hudson/model/Job/index_hu.properties
    R core/src/main/resources/hudson/model/Job/index_is.properties
    R core/src/main/resources/hudson/model/Job/index_it.properties
    M core/src/main/resources/hudson/model/Job/index_ja.properties
    R core/src/main/resources/hudson/model/Job/index_ko.properties
    R core/src/main/resources/hudson/model/Job/index_lv.properties
    R core/src/main/resources/hudson/model/Job/index_nb_NO.properties
    M core/src/main/resources/hudson/model/Job/index_nl.properties
    R core/src/main/resources/hudson/model/Job/index_pl.properties
    R core/src/main/resources/hudson/model/Job/index_pt_BR.properties
    R core/src/main/resources/hudson/model/Job/index_ro.properties
    M core/src/main/resources/hudson/model/Job/index_ru.properties
    R core/src/main/resources/hudson/model/Job/index_sk.properties
    R core/src/main/resources/hudson/model/Job/index_sv_SE.properties
    M core/src/main/resources/hudson/model/Job/index_tr.properties
    R core/src/main/resources/hudson/model/Job/index_zh_CN.properties
    R core/src/main/resources/hudson/model/Job/index_zh_TW.properties
    M maven-plugin/src/main/java/hudson/maven/MavenModule.java
    M maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index.jelly
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_cs.properties
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_da.properties
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_de.properties
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_es.properties
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_fi.properties
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_fr.properties
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_he.properties
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_hu.properties
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_it.properties
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_ja.properties
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_lv.properties
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_nb_NO.properties
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_nl.properties
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_pl.properties
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_pt_BR.properties
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_ru.properties
    R 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_sl.properties
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_sv_SE.properties
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_uk.properties
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_zh_CN.properties
    R 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_zh_TW.properties

  Log Message:
  -----------
  [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.


  Commit: d66b2e527075f81330c928bc57df62e15e4737dd
      
https://github.com/jenkinsci/jenkins/commit/d66b2e527075f81330c928bc57df62e15e4737dd
  Author: Jesse Glick <[email protected]>
  Date:   2012-07-06 (Fri, 06 Jul 2012)

  Changed paths:
    M core/src/main/java/hudson/matrix/MatrixConfiguration.java
    M core/src/main/java/hudson/model/AbstractProject.java
    M maven-plugin/src/main/java/hudson/maven/MavenModule.java

  Log Message:
  -----------
  supportsMakeDisabled defaulted to this instanceof TopLevelItem for better 
compatibility.


  Commit: ae3dac8afb6eef325958285b5a13bc933f5aacb6
      
https://github.com/jenkinsci/jenkins/commit/ae3dac8afb6eef325958285b5a13bc933f5aacb6
  Author: Jesse Glick <[email protected]>
  Date:   2012-07-10 (Tue, 10 Jul 2012)

  Changed paths:
    M changelog.html
    M core/src/main/java/hudson/model/AbstractBuild.java
    M core/src/main/java/hudson/model/Computer.java
    M core/src/main/java/hudson/model/Items.java
    M core/src/main/java/hudson/model/OverallLoadStatistics.java
    M core/src/main/java/jenkins/model/Jenkins.java
    R core/src/main/java/jenkins/model/UnlabeldLoadStatistics.java
    A core/src/main/java/jenkins/model/UnlabeledLoadStatistics.java
    M core/src/main/resources/hudson/scm/SCM/project-changes.jelly
    A core/src/test/java/hudson/model/ItemsTest.java
    M debian/debian/changelog
    M test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java

  Log Message:
  -----------
  Merge branch 'master' into JENKINS-14325

Conflicts:
        changelog.html


  Commit: 788028fa7f9bb7f32a29c47b02f87ff9650ff009
      
https://github.com/jenkinsci/jenkins/commit/788028fa7f9bb7f32a29c47b02f87ff9650ff009
  Author: Jesse Glick <[email protected]>
  Date:   2012-07-10 (Tue, 10 Jul 2012)

  Changed paths:
    M changelog.html
    M core/src/main/java/hudson/model/AbstractProject.java
    M core/src/main/resources/hudson/matrix/MatrixProject/index.jelly
    M core/src/main/resources/hudson/matrix/MatrixProject/index_cs.properties
    M core/src/main/resources/hudson/matrix/MatrixProject/index_da.properties
    M core/src/main/resources/hudson/matrix/MatrixProject/index_de.properties
    M core/src/main/resources/hudson/matrix/MatrixProject/index_es.properties
    M core/src/main/resources/hudson/matrix/MatrixProject/index_fi.properties
    M core/src/main/resources/hudson/matrix/MatrixProject/index_fr.properties
    M core/src/main/resources/hudson/matrix/MatrixProject/index_it.properties
    M core/src/main/resources/hudson/matrix/MatrixProject/index_ja.properties
    M core/src/main/resources/hudson/matrix/MatrixProject/index_pl.properties
    M core/src/main/resources/hudson/matrix/MatrixProject/index_ru.properties
    M core/src/main/resources/hudson/matrix/MatrixProject/index_zh_CN.properties
    M core/src/main/resources/hudson/model/AbstractProject/main.jelly
    A core/src/main/resources/hudson/model/AbstractProject/makeDisabled.jelly
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_bg.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_ca.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_cs.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_da.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_de.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_es.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_fi.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_fr.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_hu.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_is.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_it.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_ja.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_ko.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_lv.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_nb_NO.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_nl.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_pl.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_pt_BR.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_ro.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_ru.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_sk.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_sv_SE.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_tr.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_zh_CN.properties
    A 
core/src/main/resources/hudson/model/AbstractProject/makeDisabled_zh_TW.properties
    M core/src/main/resources/hudson/model/Job/index.jelly
    R core/src/main/resources/hudson/model/Job/index_bg.properties
    R core/src/main/resources/hudson/model/Job/index_ca.properties
    R core/src/main/resources/hudson/model/Job/index_cs.properties
    R core/src/main/resources/hudson/model/Job/index_da.properties
    R core/src/main/resources/hudson/model/Job/index_de.properties
    M core/src/main/resources/hudson/model/Job/index_es.properties
    R core/src/main/resources/hudson/model/Job/index_fi.properties
    R core/src/main/resources/hudson/model/Job/index_fr.properties
    R core/src/main/resources/hudson/model/Job/index_hu.properties
    R core/src/main/resources/hudson/model/Job/index_is.properties
    R core/src/main/resources/hudson/model/Job/index_it.properties
    M core/src/main/resources/hudson/model/Job/index_ja.properties
    R core/src/main/resources/hudson/model/Job/index_ko.properties
    R core/src/main/resources/hudson/model/Job/index_lv.properties
    R core/src/main/resources/hudson/model/Job/index_nb_NO.properties
    M core/src/main/resources/hudson/model/Job/index_nl.properties
    R core/src/main/resources/hudson/model/Job/index_pl.properties
    R core/src/main/resources/hudson/model/Job/index_pt_BR.properties
    R core/src/main/resources/hudson/model/Job/index_ro.properties
    M core/src/main/resources/hudson/model/Job/index_ru.properties
    R core/src/main/resources/hudson/model/Job/index_sk.properties
    R core/src/main/resources/hudson/model/Job/index_sv_SE.properties
    M core/src/main/resources/hudson/model/Job/index_tr.properties
    R core/src/main/resources/hudson/model/Job/index_zh_CN.properties
    R core/src/main/resources/hudson/model/Job/index_zh_TW.properties
    M maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index.jelly
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_cs.properties
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_da.properties
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_de.properties
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_es.properties
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_fi.properties
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_fr.properties
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_he.properties
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_hu.properties
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_it.properties
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_ja.properties
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_lv.properties
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_nb_NO.properties
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_nl.properties
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_pl.properties
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_pt_BR.properties
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_ru.properties
    R 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_sl.properties
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_sv_SE.properties
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_uk.properties
    M 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_zh_CN.properties
    R 
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/index_zh_TW.properties

  Log Message:
  -----------
  Merge pull request #515 from jglick/JENKINS-14325

JENKINS-14325: CCE & missing GUI when using jobs inside folders


Compare: 
https://github.com/jenkinsci/jenkins/compare/051b0016c450...788028fa7f9b

Reply via email to