Merge pull request #7 from mcupak/combination-filter

[FIXED JENKINS-22966] configurations filtered out by the combination fil...
jenkinsci · Jun 16, 2014 · 234bf4a · 234bf4a
2 parents ec27042 + 66f2235
commit 234bf4a
Showing 1 changed file with 23 additions and 20 deletions.
diff --git a/src/main/resources/net/praqma/jenkins/plugin/reloaded/MatrixReloadedAction/index.jelly b/src/main/resources/net/praqma/jenkins/plugin/reloaded/MatrixReloadedAction/index.jelly
@@ -82,12 +82,18 @@ function click2Change( status, last )
 						<j:when test="${empty(o.x) and empty(o.y)}">
 							<h2>${%Configurations}</h2>
 							<j:forEach var="p" items="${o.rows[0][0]}">
-								<!-- <d:invokeBody /> -->
-								<st:include page="main.jelly" />
-								<st:nbsp />
-								<j:if test="${!it.combinationExists(build, p.combination)}">
-									<j:set var="changed" value="1" />
-								</j:if>
+								<j:choose>
+									<j:when test="${it.combinationExists(build, p.combination)}">
+										<j:set var="style" value="display:inline-block;" />
+									</j:when>
+									<j:otherwise>
+										<j:set var="style" value="display:inline-block; background-color: lightgray;" />
+									</j:otherwise>
+									<div style="${style}">
+										<!-- <d:invokeBody /> -->
+										<st:include page="main.jelly" />
+									</div>
+								</j:choose>
 							</j:forEach>
 						</j:when>
 						<j:otherwise>
@@ -119,17 +125,20 @@ function click2Change( status, last )
 
 										<j:forEach var="c" items="${r}">
 											<td>
-												<j:choose>
-													<j:forEach var="p" items="${c}">
-														<div>
+												<j:forEach var="p" items="${c}">
+													<j:choose>
+														<j:when test="${it.combinationExists(build, p.combination)}">
+															<j:set var="style" value="" />
+														</j:when>
+														<j:otherwise>
+															<j:set var="style" value="background-color: lightgray;" />
+														</j:otherwise>
+														<div style="${style}">
 															<!-- <d:invokeBody /> -->
 															<st:include page="main.jelly" />
 														</div>
-														<j:if test="${!it.combinationExists(build, p.combination)}">
-															<j:set var="changed" value="1" />
-														</j:if>
-													</j:forEach>
-												</j:choose>
+													</j:choose>
+												</j:forEach>
 											</td>
 										</j:forEach>
 									</tr>
@@ -140,12 +149,6 @@ function click2Change( status, last )
 					<input type="hidden" name="${it.getPrefix()}NUMBER" value="${build.number}" />
 					<br />
 
-					<j:if test="${changed==1}">
-						<br />
-						<span style="font-weight:bold;font-size:20px">${%Warning, configuration has changed}</span>
-						<br /><br />
-					</j:if>
-
 					<span style="font-weight:bold">${%Select}: </span> 
 					<a href="#" onclick="click2Change({0:true}, 0);">${%Successful}</a> - 
 					<a href="#" onclick="click2Change({1:true}, 0);">${%Unstable}</a> -