Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FIY695
jenkins
提交
08459c32
J
jenkins
项目概览
FIY695
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
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,发现更多精彩内容 >>
提交
08459c32
编写于
10月 30, 2012
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FIXED JENKINS-15666] Label.getTiedJobs ignores non-top-level jobs.
上级
2fd5f247
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
13 addition
and
7 deletion
+13
-7
changelog.html
changelog.html
+3
-0
core/src/main/java/hudson/model/Label.java
core/src/main/java/hudson/model/Label.java
+1
-2
core/src/main/resources/hudson/model/Computer/index.jelly
core/src/main/resources/hudson/model/Computer/index.jelly
+1
-1
core/src/main/resources/hudson/model/Label/index.jelly
core/src/main/resources/hudson/model/Label/index.jelly
+1
-1
core/src/main/resources/hudson/views/JobColumn/column.jelly
core/src/main/resources/hudson/views/JobColumn/column.jelly
+1
-1
core/src/main/resources/lib/hudson/projectView.jelly
core/src/main/resources/lib/hudson/projectView.jelly
+6
-2
未找到文件。
changelog.html
浏览文件 @
08459c32
...
...
@@ -58,6 +58,9 @@ Upcoming changes</a>
<li
class=
bug
>
Update logging levels in LogRotator - hudson.tasks.LogRotator perform
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-15540"
>
issue 15540
</a>
)
<li
class=
bug
>
Jobs in folders not displayed when showing tied jobs for a computer or label.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-15666"
>
issue 15666
</a>
)
<li
class=
bug
>
When installing plugins with overlapping dependencies, Jenkins downloads the duplicate plugins multiple times.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-10569"
>
issue 10569
</a>
)
...
...
core/src/main/java/hudson/model/Label.java
浏览文件 @
08459c32
...
...
@@ -24,7 +24,6 @@
package
hudson.model
;
import
antlr.ANTLRException
;
import
hudson.Util
;
import
static
hudson
.
Util
.
fixNull
;
import
hudson.model.labels.LabelAtom
;
...
...
@@ -336,7 +335,7 @@ public abstract class Label extends Actionable implements Comparable<Label>, Mod
@Exported
public
List
<
AbstractProject
>
getTiedJobs
()
{
List
<
AbstractProject
>
r
=
new
ArrayList
<
AbstractProject
>();
for
(
AbstractProject
p
:
Util
.
filter
(
Jenkins
.
getInstance
().
getItems
(),
AbstractProject
.
class
)
)
{
for
(
AbstractProject
<?,?>
p
:
Jenkins
.
getInstance
().
getAllItems
(
AbstractProject
.
class
)
)
{
if
(
this
.
equals
(
p
.
getAssignedLabel
()))
r
.
add
(
p
);
}
...
...
core/src/main/resources/hudson/model/Computer/index.jelly
浏览文件 @
08459c32
...
...
@@ -111,7 +111,7 @@ THE SOFTWARE.
</p>
</j:when>
<j:otherwise>
<t:projectView jobs="${it.tiedJobs}" jobBaseUrl="${rootURL}/" />
<t:projectView jobs="${it.tiedJobs}" jobBaseUrl="${rootURL}/"
useFullName="true"
/>
</j:otherwise>
</j:choose>
...
...
core/src/main/resources/hudson/model/Label/index.jelly
浏览文件 @
08459c32
...
...
@@ -53,7 +53,7 @@ THE SOFTWARE.
</p>
</j:when>
<j:otherwise>
<t:projectView jobs="${it.tiedJobs}" jobBaseUrl="${rootURL}/" />
<t:projectView jobs="${it.tiedJobs}" jobBaseUrl="${rootURL}/"
useFullName="true"
/>
</j:otherwise>
</j:choose>
...
...
core/src/main/resources/hudson/views/JobColumn/column.jelly
浏览文件 @
08459c32
...
...
@@ -25,6 +25,6 @@ THE SOFTWARE.
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
<td style="${indenter.getCss(job)}">
<a href="${jobBaseUrl}${job.shortUrl}" class='model-link'> ${job.displayName}</a>
<a href="${jobBaseUrl}${job.shortUrl}" class='model-link'> ${
useFullName ? job.fullDisplayName :
job.displayName}</a>
</td>
</j:jelly>
\ No newline at end of file
core/src/main/resources/lib/hudson/projectView.jelly
浏览文件 @
08459c32
...
...
@@ -29,7 +29,11 @@ THE SOFTWARE.
Renders a list of jobs and their key information.
<st:attribute name="jobs" use="required" trim="Collection">
Items to disable.
Items to show.
</st:attribute>
<st:attribute name="useFullName" use="optional" type="boolean">
May be interpreted by columns to display the full name of a job.
Will also append a parent URL to jobBaseUrl if needed.
</st:attribute>
<st:attribute name="jobBaseUrl" type="String">
The base URL of all job links. Normally ${rootURL}/
...
...
@@ -75,7 +79,7 @@ THE SOFTWARE.
</j:forEach>
<j:forEach var="job" items="${jobs}">
<t:projectViewRow />
<t:projectViewRow
jobBaseUrl="${useFullName ? jobBaseUrl + job.parent.url : jobBaseUrl}"
/>
</j:forEach>
</table>
<t:iconSize><t:rssBar/></t:iconSize>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录