Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[JENKINS-22964] configurations run within the selected matrix build a…
…re highlighted in the configuration matrix and can be selected using the Run in this build filter
  • Loading branch information
mcupak committed May 10, 2014
1 parent f761593 commit 637e021
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 27 deletions.
Expand Up @@ -35,22 +35,15 @@
<l:main-panel>

<script><![CDATA[
function click2Change( status )
function click2Change( status, last )
{
var i;
for( i = 0, len = document.matrixreloaded.elements.length ; i < len ; i++ )
{
var element = document.matrixreloaded.elements[i];
if( element.type == 'checkbox' )
{
if( element.value == status || status > 999 )
{
element.checked = true;
}
else
{
element.checked = false;
}
element.checked = (element.value in status) || ((parseInt(element.value) + 10) in status && !last);
}
}
return false;
Expand Down Expand Up @@ -154,19 +147,18 @@ function click2Change( status )
</j:if>

<span style="font-weight:bold">${%Select}: </span>
<a href="#" onclick="click2Change(0);">${%Successful}</a> -
<a href="#" onclick="click2Change(1);">${%Unstable}</a> -
<a href="#" onclick="click2Change(2);">${%Failed}</a> -
<a href="#" onclick="click2Change(1000);">${%All}</a> -
<a href="#" onclick="click2Change(-1);">${%None}</a>

<a href="#" onclick="click2Change({0:true}, 0);">${%Successful}</a> -
<a href="#" onclick="click2Change({1:true}, 0);">${%Unstable}</a> -
<a href="#" onclick="click2Change({2:true}, 0);">${%Failed}</a> -
<a href="#" onclick="click2Change({0:true,1:true,2:true,4:true}, 1);">${%Run in this build}</a> -
<a href="#" onclick="click2Change({0:true,1:true,2:true,3:true,4:true}, 0);">${%All}</a> -
<a href="#" onclick="click2Change({}, 0);">${%None}</a>
<br/>
<label>Matrix Reload downstream builds: </label>
<f:checkbox name="forceDownstream" checked="false" />
<br/>
<br/>
<label>Matrix Reload downstream builds: </label>
<f:checkbox name="forceDownstream" checked="false" />
<br/>
<br /><f:submit value="${%Rebuild Matrix}" />


<f:submit value="${%Rebuild Matrix}" />
</f:form>
</div>
</l:main-panel>
Expand Down
Expand Up @@ -33,21 +33,20 @@
height="24" width="24" />
</j:when>
<j:otherwise>
<a href="${request.getRootPath()}/${b.getUrl()}">
<img src="${imagesURL}/24x24/${b.buildStatusUrl}" tooltip="${p.tooltip}"
alt="${p.tooltip}" height="24" width="24" />
<a href="${p.nearestRunUrl}" class="model-link inside">
<img src="${imagesURL}/24x24/${b.buildStatusUrl}" tooltip="${p.tooltip} ${build.number!=b.number?(build.isBuilding()?'- pending' : '- skipped'):''}" alt="${p.tooltip}" style="${build.number!=b.number?'opacity:0.5':''}" height="24" width="24"/>
<j:if test="${empty(o.x) and empty(o.y)}">
${p.combination.toString(o.z)}
</j:if>
</j:if>
</a>
</j:otherwise>
</j:choose>
<j:choose>
<j:when test="${(b.getResult().ordinal==0 and defaultChecked.length()==0) or (!defaultChecked.equals(p.combination.toString()) and defaultChecked.length()>0)}">
<f:checkbox name="${prefix}${p.combination.toString()}" checked="false" value="${b.getResult().ordinal}" />
<f:checkbox name="${prefix}${p.combination.toString()}" checked="false" value="${(b==null ? 3 : b.getResult().ordinal)-(build.number==b.number ? 0 : 10 )}" />
</j:when>
<j:otherwise>
<f:checkbox name="${prefix}${p.combination.toString()}" checked="true" value="${b.getResult().ordinal}" />
<f:checkbox name="${prefix}${p.combination.toString()}" checked="true" value="${(b==null ? 3 : b.getResult().ordinal)-(build.number==b.number ? 0 : 10 )}" />
</j:otherwise>
</j:choose>
</j:jelly>
Expand Down

0 comments on commit 637e021

Please sign in to comment.