Skip to content

J
jenkins

xxadev / jenkins
与 Fork 源项目一致

从无法访问的项目Fork

通知 3
Star 0
Fork 0
J
jenkins

体验新版 GitCode，发现更多精彩内容 >>

提交 a1eee0b9 编写于 作者: S Seiji Sogabe
浏览文件
操作

Merge branch 'main' of https://github.com/jieryn/hudson into jieryn-main

上级 2951e6ab 945d04aa
隐藏空白更改
内联 并排
Showing with 64 addition and 61 deletion
changelog.html
浏览文件 @ a1eee0b9
...@@ -59,6 +59,9 @@ Upcoming changes</a> ...@@ -59,6 +59,9 @@ Upcoming changes</a>
<li class=bug> <li class=bug>
Node names can be edited to include slashes and then cannot be removed. Node names can be edited to include slashes and then cannot be removed.
(<a href="http://issues.hudson-ci.org/browse/HUDSON-8438">issue 8437</a>) (<a href="http://issues.hudson-ci.org/browse/HUDSON-8438">issue 8437</a>)
<li class=bug>
Fix temporarily offline slaves not showing active jobs
(<a href="http://issues.hudson-ci.org/browse/HUDSON-8546">issue 8546</a>)
<li class=rfe> <li class=rfe>
Startup performance improvement Startup performance improvement
<li class=rfe> <li class=rfe>
......
core/src/main/resources/lib/hudson/executors.jelly
浏览文件 @ a1eee0b9
...@@ -38,63 +38,67 @@ THE SOFTWARE. ...@@ -38,63 +38,67 @@ THE SOFTWARE.
<j:if test="${!c.acceptingTasks}"> <st:nbsp/> (${%suspended})</j:if> <j:if test="${!c.acceptingTasks}"> <st:nbsp/> (${%suspended})</j:if>
</d:tag> </d:tag>
<d:tag name="executor"> <d:tag name="executor">
<tr> <j:choose>
<td class="pane" align="right" style="vertical-align: top"> <j:when test="${!c.offline or (c.offline and !e.idle)}">
${name} <tr>
</td> <td class="pane" align="right" style="vertical-align: top">
<j:choose> ${name}
<j:when test="${!e.alive}">
<td class="pane">
<a href="${rootURL}/${c.url}${url}/causeOfDeath">
<div class="error">${%Dead} (!)</div>
</a>
</td> </td>
<td class="pane"/> <j:choose>
</j:when> <j:when test="${!e.alive}">
<j:when test="${e.idle}"> <td class="pane">
<td class="pane"> <a href="${rootURL}/${c.url}${url}/causeOfDeath">
<j:choose> <div class="error">${%Dead} (!)</div>
<j:when test="${c.offline}"> </a>
<a href="${rootURL}/${c.url}">${%Offline}</a> </td>
</j:when> <td class="pane"/>
<j:otherwise> </j:when>
${%Idle} <j:when test="${e.idle}">
</j:otherwise> <td class="pane">
</j:choose>
</td>
<td class="pane"/>
</j:when>
<j:otherwise>
<!-- not actually optional, but it helps with backward compatibility -->
<j:set var="executor" value="${e}" />
<st:include it="${e.currentExecutable}" page="executorCell.jelly" optional="true">
<td class="pane">
<div style="white-space: normal">${%Building}
<j:set var="exe" value="${e.currentExecutable}" />
<j:invokeStatic var="exeparent"
className="hudson.model.queue.Executables" method="getParentOf">
<j:arg type="hudson.model.Queue$Executable" value="${exe}" />
</j:invokeStatic>
<j:choose> <j:choose>
<j:when test="${h.hasPermission(exeparent,exeparent.READ)}"> <j:when test="${c.offline}">
<a href="${rootURL}/${exeparent.url}">${exeparent.fullDisplayName}</a>&#160;<a href="${rootURL}/${exe.url}">#${exe.number}</a> <a href="${rootURL}/${c.url}">${%Offline}</a>
<t:buildProgressBar build="${exe}" executor="${executor}"/>
</j:when> </j:when>
<j:otherwise> <j:otherwise>
<span>${%Unknown Task}</span> ${%Idle}
</j:otherwise> </j:otherwise>
</j:choose> </j:choose>
</div> </td>
</td> <td class="pane"/>
</st:include> </j:when>
<td class="pane" align="center" valign="middle"> <j:otherwise>
<j:if test="${e.hasStopPermission()}"> <!-- not actually optional, but it helps with backward compatibility -->
<a href="${rootURL}/${c.url}${url}/stop"><img src="${imagesURL}/16x16/stop.gif" alt="${%terminate this build}" /></a> <j:set var="executor" value="${e}" />
</j:if> <st:include it="${e.currentExecutable}" page="executorCell.jelly" optional="true">
</td> <td class="pane">
</j:otherwise> <div style="white-space: normal">${%Building}
</j:choose> <j:set var="exe" value="${e.currentExecutable}" />
</tr> <j:invokeStatic var="exeparent"
className="hudson.model.queue.Executables" method="getParentOf">
<j:arg type="hudson.model.Queue$Executable" value="${exe}" />
</j:invokeStatic>
<j:choose>
<j:when test="${h.hasPermission(exeparent,exeparent.READ)}">
<a href="${rootURL}/${exeparent.url}">${exeparent.fullDisplayName}</a>&#160;<a href="${rootURL}/${exe.url}">#${exe.number}</a>
<t:buildProgressBar build="${exe}" executor="${executor}"/>
</j:when>
<j:otherwise>
<span>${%Unknown Task}</span>
</j:otherwise>
</j:choose>
</div>
</td>
</st:include>
<td class="pane" align="center" valign="middle">
<j:if test="${e.hasStopPermission()}">
<a href="${rootURL}/${c.url}${url}/stop"><img src="${imagesURL}/16x16/stop.gif" alt="${%terminate this build}" /></a>
</j:if>
</td>
</j:otherwise>
</j:choose>
</tr>
</j:when>
</j:choose>
</d:tag> </d:tag>
</d:taglib> </d:taglib>
<j:set var="computers" value="${attrs.computers?:app.computers}" /> <j:set var="computers" value="${attrs.computers?:app.computers}" />
...@@ -126,16 +130,12 @@ THE SOFTWARE. ...@@ -126,16 +130,12 @@ THE SOFTWARE.
</j:otherwise> </j:otherwise>
</j:choose> </j:choose>
</tr> </tr>
<j:choose> <j:forEach var="e" items="${c.executors}" varStatus="eloop">
<j:when test="${!c.offline}"> <local:executor name="${eloop.index+1}" url="executors/${eloop.index}" />
<j:forEach var="e" items="${c.executors}" varStatus="eloop"> </j:forEach>
<local:executor name="${eloop.index+1}" url="executors/${eloop.index}" /> <j:forEach var="e" items="${c.oneOffExecutors}" varStatus="eloop">
</j:forEach> <local:executor name="" url="oneOffExecutors/${eloop.index}" />
<j:forEach var="e" items="${c.oneOffExecutors}" varStatus="eloop"> </j:forEach>
<local:executor name="" url="oneOffExecutors/${eloop.index}" />
</j:forEach>
</j:when>
</j:choose>
</j:forEach> </j:forEach>
</l:pane> </l:pane>
<!-- schedule updates only for the full page reload --> <!-- schedule updates only for the full page reload -->
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或