Skip to content

Commit

Permalink
Integrated fix for HUDSON-8252
Browse files Browse the repository at this point in the history
* commit '9a45f788bf4954943644730cb1659ba5b7a057f6':
  HUDSON-8252 FIXED update changelog.html appropriately
  HUDSON-8252 FIXED offline slaves wasting space in status list
  • Loading branch information
jieryn authored and kohsuke committed Dec 8, 2010
2 parents 6be060a + 9a45f78 commit e36c259
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
3 changes: 3 additions & 0 deletions changelog.html
Expand Up @@ -40,6 +40,9 @@
<!-- Record your changes in the trunk here. -->
<div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
<ul class=image>
<li class=rfe>
Hide executors for offline nodes to conserve space in Build Executors Status list.
(<a href="http://issues.hudson-ci.org/browse/HUDSON-8252">issue 8252</a>)
<li class=bug>
throw AccessDeniedException if "Authentication Token" is invalid.
(<a href="http://hudson.361315.n4.nabble.com/-td3069369.html">hudson-ja</a>)
Expand Down
16 changes: 10 additions & 6 deletions core/src/main/resources/lib/hudson/executors.jelly
Expand Up @@ -126,12 +126,16 @@ THE SOFTWARE.
</j:otherwise>
</j:choose>
</tr>
<j:forEach var="e" items="${c.executors}" varStatus="eloop">
<local:executor name="${eloop.index+1}" url="executors/${eloop.index}" />
</j:forEach>
<j:forEach var="e" items="${c.oneOffExecutors}" varStatus="eloop">
<local:executor name="" url="oneOffExecutors/${eloop.index}" />
</j:forEach>
<j:choose>
<j:when test="${!c.offline}">
<j:forEach var="e" items="${c.executors}" varStatus="eloop">
<local:executor name="${eloop.index+1}" url="executors/${eloop.index}" />
</j:forEach>
<j:forEach var="e" items="${c.oneOffExecutors}" varStatus="eloop">
<local:executor name="" url="oneOffExecutors/${eloop.index}" />
</j:forEach>
</j:when>
</j:choose>
</j:forEach>
</l:pane>
<!-- schedule updates only for the full page reload -->
Expand Down

0 comments on commit e36c259

Please sign in to comment.