Merge pull request #3 from ikedam/feature/JENKINS-21970_enableCheckbo…

…xOnRebuild [JENKINS-21970] enable checkbox on rebuild
jenkinsci · Mar 29, 2014 · 4b3888f · 4b3888f
2 parents 23be256 + d33097d
commit 4b3888f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/...plugins/matrix_configuration_parameter/MatrixCombinationsParameterDefinition/index.groovy b/...plugins/matrix_configuration_parameter/MatrixCombinationsParameterDefinition/index.groovy
@@ -86,7 +86,7 @@ private void drawMainBall(Combination combination,AxisList axes,String matrixNam
     if (lastBuild != null && lastBuild.getRun(combination)!=null){
         lastRun = lastBuild.getRun(combination);
         if (lastRun != null){
-            a(href:request.getRootPath()+"/"+lastRun.getUrl()){
+            a(href:rootURL+"/"+lastRun.getUrl()){
             img(src: "${imagesURL}/24x24/"+lastRun.getBuildStatusUrl())
             if (!layouter.x || !layouter.y) {
               text(combination.toString(layouter.z))

diff --git a/...on/plugins/matrix_configuration_parameter/MatrixCombinationsParameterValue/rebuild.groovy b/...on/plugins/matrix_configuration_parameter/MatrixCombinationsParameterValue/rebuild.groovy
@@ -47,14 +47,14 @@ private void drawTableBall(MatrixBuild.RunPtr runPtr,AxisList axes,matrixValue,M
     run = runPtr.getRun();
     result = matrixValue.combinationExists(runPtr.combination);
     if (result){
-        a(href:request.getRootPath()+"/"+run.getUrl()){
+        a(href:rootURL+"/"+run.getUrl()){
             img(src: "${imagesURL}/24x24/"+run.getBuildStatusUrl());
             if (!layouter.x || !layouter.y) {
               text(runPtr.combination.toString(layouter.z))
             }
-            f.checkbox(checked: "true", name: "values",id: "checkbox"+matrixValue.getName());
-            input(type: "hidden", name: "confs", value: runPtr.combination.toString());
         }
+        f.checkbox(checked: "true", name: "values",id: "checkbox"+matrixValue.getName());
+        input(type: "hidden", name: "confs", value: runPtr.combination.toString());
 
     } else {
         img(src: "${imagesURL}/24x24/grey.gif");

diff --git a/...dson/plugins/matrix_configuration_parameter/MatrixCombinationsParameterValue/value.groovy b/...dson/plugins/matrix_configuration_parameter/MatrixCombinationsParameterValue/value.groovy
@@ -99,7 +99,7 @@ private void drawTableBall(MatrixBuild.RunPtr runPtr,AxisList axes,MatrixCombina
     run = runPtr.getRun();
     result = matrixValue.combinationExists(runPtr.combination);
     if (result){
-        a(href:request.getRootPath()+"/"+run.getUrl()){
+        a(href:rootURL+"/"+run.getUrl()){
             img(src: "${imagesURL}/24x24/"+run.getBuildStatusUrl());
             f.checkbox(checked: "true",onclick:"return false;", onkeydown:"return false;", name: "values",id: "checkbox"+matrixValue.getName());
             input(type: "hidden", name: "confs", value: runPtr.combination.toString());