[FIXED JENKINS-15042] “Took…on master” shown for a build which ran on…

… a slave which was since deleted.
jenkinsci · Sep 4, 2012 · 53f2177 · 53f2177
1 parent fd8fa54
commit 53f2177
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 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>
+    “Took…on master” shown for a build which ran on a slave which was since deleted.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15042">issue 15042</a>)
   <li class=>
 </ul>
 </div><!--=TRUNK-END=-->

diff --git a/core/src/main/resources/hudson/model/AbstractBuild/index.jelly b/core/src/main/resources/hudson/model/AbstractBuild/index.jelly
@@ -41,8 +41,8 @@ THE SOFTWARE.
           <j:if test="${!it.building}">
             ${%Took} <a href="${rootURL}/${it.parent.url}buildTimeTrend">${it.durationString}</a>
           </j:if>
-          <j:if test="${!empty(app.slaves)}">
-            ${%on} <t:node value="${it.builtOn}"/>
+          <j:if test="${!empty(app.slaves) or (it.builtOnStr != null and it.builtOnStr != '')}">
+            ${%on} <t:node value="${it.builtOn}" valueStr="${it.builtOnStr}"/>
           </j:if>
         </div>
       </div>

diff --git a/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly b/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly
@@ -66,7 +66,7 @@ THE SOFTWARE.
                   </td>
                   <j:if test="${isMasterSlaveEnabled}">
                     <td>
-                      <t:node value="${r.builtOn}"/>
+                      <t:node value="${r.builtOn}" valueStr="${r.builtOnStr}"/>
                     </td>
                   </j:if>
                 </tr>

diff --git a/core/src/main/resources/lib/hudson/node.jelly b/core/src/main/resources/lib/hudson/node.jelly
@@ -27,11 +27,15 @@ THE SOFTWARE.
   <st:documentation>
     Displays a link to a node.
     <st:attribute name="value" use="required" type="Node"/>
+    <st:attribute name="valueStr" use="optional" type="String"/>
   </st:documentation>
   <j:choose>
     <j:when test="${value!=null and value!=app}">
       <a href="${rootURL}/computer/${value.nodeName}" class="model-link">${value.nodeName}</a>
     </j:when>
+    <j:when test="${valueStr != null and valueStr != ''}">
+      ${valueStr}
+    </j:when>
     <j:otherwise>
       ${%master}
     </j:otherwise>