Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
1d254b7d
J
jenkins
项目概览
xxadev
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jenkins
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1d254b7d
编写于
3月 26, 2015
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1627 from stephenc/simplify-executors-display
simplify displaying the executors
上级
1d818a16
3eca1036
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
19 addition
and
4 deletion
+19
-4
core/src/main/java/hudson/model/Computer.java
core/src/main/java/hudson/model/Computer.java
+7
-2
core/src/main/java/hudson/model/Executor.java
core/src/main/java/hudson/model/Executor.java
+11
-0
core/src/main/resources/lib/hudson/executors.jelly
core/src/main/resources/lib/hudson/executors.jelly
+1
-2
未找到文件。
core/src/main/java/hudson/model/Computer.java
浏览文件 @
1d254b7d
...
...
@@ -62,6 +62,7 @@ import hudson.util.RunList;
import
hudson.util.Futures
;
import
hudson.util.NamingThreadFactory
;
import
jenkins.model.Jenkins
;
import
jenkins.model.queue.AsynchronousExecution
;
import
jenkins.util.ContextResettingExecutorService
;
import
jenkins.security.MasterToSlaveCallable
;
import
org.kohsuke.accmod.Restricted
;
...
...
@@ -898,12 +899,16 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
List
<
DisplayExecutor
>
result
=
new
ArrayList
<
DisplayExecutor
>(
executors
.
size
()+
oneOffExecutors
.
size
());
int
index
=
0
;
for
(
Executor
e:
executors
)
{
result
.
add
(
new
DisplayExecutor
(
Integer
.
toString
(
index
+
1
),
String
.
format
(
"executors/%d"
,
index
),
e
));
if
(
e
.
isDisplayCell
())
{
result
.
add
(
new
DisplayExecutor
(
Integer
.
toString
(
index
+
1
),
String
.
format
(
"executors/%d"
,
index
),
e
));
}
index
++;
}
index
=
0
;
for
(
OneOffExecutor
e:
oneOffExecutors
)
{
result
.
add
(
new
DisplayExecutor
(
""
,
String
.
format
(
"oneOffExecutors/%d"
,
index
),
e
));
if
(
e
.
isDisplayCell
())
{
result
.
add
(
new
DisplayExecutor
(
""
,
String
.
format
(
"oneOffExecutors/%d"
,
index
),
e
));
}
index
++;
}
return
result
;
...
...
core/src/main/java/hudson/model/Executor.java
浏览文件 @
1d254b7d
...
...
@@ -586,6 +586,17 @@ public class Executor extends Thread implements ModelObject {
}
}
/**
* Returns {@code true} if the {@code executorCell.jelly} for this {@link Executor} should be visible.
*
* @return {@code true} if the {@code executorCell.jelly} for this {@link Executor} should be visible.
* @since 1.607
*/
public
boolean
isDisplayCell
()
{
AsynchronousExecution
asynchronousExecution
=
getAsynchronousExecution
();
return
asynchronousExecution
==
null
||
asynchronousExecution
.
displayCell
();
}
/**
* Returns true if this executor is waiting for a task to execute.
*/
...
...
core/src/main/resources/lib/hudson/executors.jelly
浏览文件 @
1d254b7d
...
...
@@ -39,8 +39,7 @@ THE SOFTWARE.
<j:if test="${!c.acceptingTasks}"> <st:nbsp/> (${%suspended})</j:if>
</d:tag>
<d:tag name="executor">
<j:set var="ae" value="${e.asynchronousExecution}"/>
<j:if test="${(!c.offline or (c.offline and !e.idle)) and (ae == null || ae.displayCell())}">
<j:if test="${!c.offline or (c.offline and !e.idle)}">
<tr>
<td class="pane" align="right" style="vertical-align: top">
${name}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录