Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FIY695
jenkins
提交
e8c663e2
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,发现更多精彩内容 >>
提交
e8c663e2
编写于
7月 26, 2013
作者:
K
Kohsuke Kawaguchi
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'pull-827'
上级
3e7181d9
14b3d918
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
67 addition
and
1 deletion
+67
-1
changelog.html
changelog.html
+3
-0
core/src/main/java/hudson/model/Run.java
core/src/main/java/hudson/model/Run.java
+11
-1
core/src/main/resources/hudson/model/Run/delete-retry.jelly
core/src/main/resources/hudson/model/Run/delete-retry.jelly
+28
-0
core/src/main/resources/hudson/model/Run/delete-retry.properties
...c/main/resources/hudson/model/Run/delete-retry.properties
+25
-0
未找到文件。
changelog.html
浏览文件 @
e8c663e2
...
...
@@ -55,6 +55,9 @@ Upcoming changes</a>
<!-- Record your changes in the trunk here. -->
<div
id=
"trunk"
style=
"display:none"
>
<!--=TRUNK-BEGIN=-->
<ul
class=
image
>
<li
class=
rfe
>
Report an user friendly error page if a deletion of a build fails.
(
<a
href=
"https://github.com/jenkinsci/jenkins/pull/827"
>
pull request 827
</a>
)
<li
class=
rfe
>
Can't build using maven 3.1.0
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-15935"
>
issue 15935
</a>
)
...
...
core/src/main/java/hudson/model/Run.java
浏览文件 @
e8c663e2
...
...
@@ -117,6 +117,7 @@ import org.kohsuke.stapler.interceptor.RequirePOST;
import
java.io.FileOutputStream
;
import
java.io.OutputStream
;
import
java.io.StringWriter
;
import
static
java
.
util
.
logging
.
Level
.*;
import
javax.annotation.CheckForNull
;
import
javax.annotation.Nonnull
;
...
...
@@ -1999,7 +2000,16 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
return
;
}
try
{
delete
();
}
catch
(
IOException
ex
){
StringWriter
writer
=
new
StringWriter
();
ex
.
printStackTrace
(
new
PrintWriter
(
writer
));
req
.
setAttribute
(
"stackTraces"
,
writer
);
req
.
getView
(
this
,
"delete-retry.jelly"
).
forward
(
req
,
rsp
);
return
;
}
rsp
.
sendRedirect2
(
req
.
getContextPath
()+
'/'
+
getParent
().
getUrl
());
}
...
...
core/src/main/resources/hudson/model/Run/delete-retry.jelly
0 → 100644
浏览文件 @
e8c663e2
<?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">
<l:layout title="${it.fullDisplayName}" norefresh="true">
<st:include page="sidepanel.jelly" />
<l:main-panel>
<table>
<tr><td>
<form method="post" action="doDelete">
<div class="error">
${%Not successful}
</div>
<f:submit name="now" value="${%Retry delete}" />
</form>
</td></tr>
<tr><td>
<a onclick="document.getElementById('delete-error').style.display='block';return false" href="">${%Show reason}</a>
</td></tr>
<tr><td>
<div id="delete-error" style="display: none">
<pre>
${request.getAttribute('stackTraces')}
</pre>
</div>
</td></tr>
</table>
</l:main-panel>
</l:layout>
</j:jelly>
\ No newline at end of file
core/src/main/resources/hudson/model/Run/delete-retry.properties
0 → 100644
浏览文件 @
e8c663e2
# The MIT License
#
# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Frederic Gurr
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
Not\
successful
=
Deletion of the build failed
Retry\
delete
=
Retry delete
Show\
reason
=
Show reason
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录