Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
43f1f5d1
J
jenkins
项目概览
LinuxSuRen
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
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,发现更多精彩内容 >>
提交
43f1f5d1
编写于
8月 15, 2012
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FIXED JENKINS-14813] 404 canceling queue items.
上级
c2f3012a
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
20 addition
and
6 deletion
+20
-6
changelog.html
changelog.html
+4
-1
core/src/main/java/hudson/model/Queue.java
core/src/main/java/hudson/model/Queue.java
+14
-3
core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries.jelly
...resources/hudson/widgets/BuildHistoryWidget/entries.jelly
+1
-1
core/src/main/resources/lib/hudson/queue.jelly
core/src/main/resources/lib/hudson/queue.jelly
+1
-1
未找到文件。
changelog.html
浏览文件 @
43f1f5d1
...
...
@@ -55,9 +55,12 @@ Upcoming changes</a>
<!-- Record your changes in the trunk here. -->
<div
id=
"trunk"
style=
"display:none"
>
<!--=TRUNK-BEGIN=-->
<ul
class=
image
>
<li
class=
bug
>
Avoid a 404 when canceling queue items.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-14813"
>
issue 14813
</a>
)
<li
class=
bug
>
Added missing parameters as defaults when called from CLI
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-7162"
>
issue 7162
</a>
)
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-7162"
>
issue 7162
</a>
)
<li
class=
bug
>
NPE from
<code>
UpdateSite$Plugin.getNeededDependencies
</code>
.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-14769"
>
issue 14769
</a>
)
...
...
core/src/main/java/hudson/model/Queue.java
浏览文件 @
43f1f5d1
...
...
@@ -102,6 +102,7 @@ import org.kohsuke.stapler.export.ExportedBean;
import
com.thoughtworks.xstream.XStream
;
import
com.thoughtworks.xstream.converters.basic.AbstractSingleValueConverter
;
import
org.kohsuke.stapler.QueryParameter
;
/**
* Build queue.
...
...
@@ -570,6 +571,17 @@ public class Queue extends ResourceController implements Saveable {
return
r
;
}
/**
* Called from {@code queue.jelly} and {@code entries.jelly}.
*/
public
HttpResponse
doCancelItem
(
@QueryParameter
int
id
)
throws
IOException
,
ServletException
{
Item
item
=
getItem
(
id
);
if
(
item
!=
null
)
{
cancel
(
item
);
}
// else too late, ignore (JENKINS-14813)
return
HttpResponses
.
forwardToPreviousPage
();
}
public
synchronized
boolean
isEmpty
()
{
return
waitingList
.
isEmpty
()
&&
blockedProjects
.
isEmpty
()
&&
buildables
.
isEmpty
()
&&
pendings
.
isEmpty
();
}
...
...
@@ -1362,9 +1374,8 @@ public class Queue extends ResourceController implements Saveable {
return
null
;
}
/**
* Called from queue.jelly.
*/
/** @deprecated Use {@link #doCancelItem} instead. */
@Deprecated
public
HttpResponse
doCancelQueue
()
throws
IOException
,
ServletException
{
Jenkins
.
getInstance
().
getQueue
().
cancel
(
this
);
return
HttpResponses
.
forwardToPreviousPage
();
...
...
core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries.jelly
浏览文件 @
43f1f5d1
...
...
@@ -43,7 +43,7 @@ THE SOFTWARE.
<td style="white-space:normal;" colspan="2">
<div style="float:right">
<j:if test="${item.hasCancelPermission()}">
<a href="${rootURL}/queue/
item/${item.id}/cancelQueue
">
<a href="${rootURL}/queue/
cancelItem?id=${item.id}
">
<img src="${imagesURL}/16x16/stop.png" alt="${%cancel this build}" height="16" width="16"/>
</a>
</j:if>
...
...
core/src/main/resources/lib/hudson/queue.jelly
浏览文件 @
43f1f5d1
...
...
@@ -79,7 +79,7 @@ THE SOFTWARE.
</td>
<td class="pane" width="16" align="center" valign="middle">
<j:if test="${item.hasCancelPermission()}">
<a href="${rootURL}/queue/
item/${item.id}/cancelQueue
"><img src="${imagesURL}/16x16/stop.png" alt="cancel this build" height="16" width="16"/></a>
<a href="${rootURL}/queue/
cancelItem?id=${item.id}
"><img src="${imagesURL}/16x16/stop.png" alt="cancel this build" height="16" width="16"/></a>
</j:if>
</td>
</tr>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录