[FIXED HUDSON-3167] Avoid broken images/links in matrix project

when some combinations are not run due to filter.


git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@15991 71c3de6d-444a-0410-be80-ed276b4c234a

core/src/main/resources/hudson/matrix/MatrixBuild/ajaxMatrix.jelly

@@ -29,13 +29,19 @@ THE SOFTWARE.
   <l:ajax>
     <p:matrix autoRefresh="${it.isBuilding()}">
       <j:set var="b" value="${p.run}" />
-      <a href="${p.combination}/">
-        <img src="${imagesURL}/24x24/${h.ifThenElse(b!=null,b.buildStatusUrl,'grey.gif')}"
-             tooltip="${p.tooltip}" alt="${p.tooltip}"/>
-        <j:if test="${empty(o.x) and empty(o.y)}">
-          ${p.combination.toString(o.z)}
-        </j:if>
-      </a>
+      <j:choose>
+        <j:when test="${b==null}">
+          <img src="${imagesURL}/24x24/grey.gif" tooltip="${%Not run}" alt="${%Not run}"/>
+        </j:when>
+        <j:otherwise>
+          <a href="${p.combination}/">
+            <img src="${imagesURL}/24x24/${b.buildStatusUrl}" tooltip="${p.tooltip}" alt="${p.tooltip}"/>
+            <j:if test="${empty(o.x) and empty(o.y)}">
+              ${p.combination.toString(o.z)}
+            </j:if>
+          </a>
+        </j:otherwise>
+      </j:choose>
     </p:matrix>
   </l:ajax>
 </j:jelly>

core/src/main/resources/hudson/matrix/MatrixProject/ajaxMatrix.jelly

@@ -28,12 +28,19 @@ 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:s="/lib/form" xmlns:p="/lib/hudson/project">
   <l:ajax>
     <p:matrix autoRefresh="true">
-      <a href="${p.shortUrl}">
-        <img src="${imagesURL}/24x24/${p.buildStatusUrl}" tooltip="${p.iconColor.description}" alt="${p.iconColor.description}"/>
-        <j:if test="${empty(o.x) and empty(o.y)}">
-          ${p.combination.toString(o.z)}
-        </j:if>
-      </a>
+      <j:choose>
+        <j:when test="${p==null}">
+          <img src="${imagesURL}/24x24/grey.gif" tooltip="${%Not configured}" alt="${%Not configured}"/>
+        </j:when>
+        <j:otherwise>
+          <a href="${p.shortUrl}">
+            <img src="${imagesURL}/24x24/${p.buildStatusUrl}" tooltip="${p.iconColor.description}" alt="${p.iconColor.description}"/>
+            <j:if test="${empty(o.x) and empty(o.y)}">
+              ${p.combination.toString(o.z)}
+            </j:if>
+          </a>
+        </j:otherwise>
+      </j:choose>
     </p:matrix>
   </l:ajax>
 </j:jelly>

core/src/main/resources/lib/hudson/project/matrix.jelly

@@ -43,7 +43,7 @@ THE SOFTWARE.
   <j:set var="o" value="${it.layouter}"/>
   <div id='matrix'>
     <j:choose>
-      <!-- Optimized case when there's only dimention to the axis (or zero dimension) -->
+      <!-- Optimized case when there's only one dimension to the axis (or zero dimension) -->
       <j:when test="${empty(o.x) and empty(o.y)}">
         <h2>${%Configurations}</h2>
         <j:forEach var="p" items="${o.rows[0][0]}">
@@ -98,4 +98,4 @@ THE SOFTWARE.
       </script>
     </j:if>
   </div>
-</j:jelly>
\ No newline at end of file
+</j:jelly>