Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
3af3a271
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,发现更多精彩内容 >>
提交
3af3a271
编写于
8月 31, 2016
作者:
D
Daniel Beck
提交者:
GitHub
8月 31, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FIX JENKINS-30565] Ask for confirmation before canceling/aborting (#1835)
上级
55e23a3d
变更
10
显示空白变更内容
内联
并排
Showing
10 changed file
with
27 addition
and
10 deletion
+27
-10
core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries.properties
...rces/hudson/widgets/BuildHistoryWidget/entries.properties
+1
-0
core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly
...c/main/resources/hudson/widgets/HistoryWidget/entry.jelly
+2
-2
core/src/main/resources/hudson/widgets/HistoryWidget/entry.properties
...n/resources/hudson/widgets/HistoryWidget/entry.properties
+1
-0
core/src/main/resources/lib/hudson/buildCaption.jelly
core/src/main/resources/lib/hudson/buildCaption.jelly
+1
-1
core/src/main/resources/lib/hudson/buildCaption.properties
core/src/main/resources/lib/hudson/buildCaption.properties
+1
-0
core/src/main/resources/lib/hudson/executors.jelly
core/src/main/resources/lib/hudson/executors.jelly
+1
-1
core/src/main/resources/lib/hudson/executors.properties
core/src/main/resources/lib/hudson/executors.properties
+2
-1
core/src/main/resources/lib/hudson/queue.jelly
core/src/main/resources/lib/hudson/queue.jelly
+1
-1
core/src/main/resources/lib/hudson/queue.properties
core/src/main/resources/lib/hudson/queue.properties
+2
-1
core/src/main/resources/lib/layout/stopButton.jelly
core/src/main/resources/lib/layout/stopButton.jelly
+15
-3
未找到文件。
core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries.properties
0 → 100644
浏览文件 @
3af3a271
confirm
=
Are you sure you want to cancel the queued run of {0}?
core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly
浏览文件 @
3af3a271
...
...
@@ -62,7 +62,7 @@ THE SOFTWARE.
<div class="build-stop">
<!-- Check ABORT permission for Project, Admin permission otherwise -->
<j:if test="${empty(it.widget.owner.ABORT) ? h.hasPermission(app.ADMINISTER) : it.widget.owner.hasPermission(it.widget.owner.ABORT)}">
<l:stopButton href="${link}stop" alt="[cancel]"/>
<l:stopButton href="${link}stop" alt="[cancel]"
confirm="${%confirm(build.fullDisplayName)}"
/>
</j:if>
</div>
</j:if>
...
...
core/src/main/resources/hudson/widgets/HistoryWidget/entry.properties
0 → 100644
浏览文件 @
3af3a271
confirm
=
Are you sure you want to abort {0}?
core/src/main/resources/lib/hudson/buildCaption.jelly
浏览文件 @
3af3a271
...
...
@@ -37,7 +37,7 @@ THE SOFTWARE.
<t:buildProgressBar build="${it}"/>
</td><td>
<j:if test="${it.parent.hasAbortPermission()}">
<l:stopButton href="stop" alt="[${%cancel}]"/>
<l:stopButton href="stop"
confirm="${%confirm(it.fullDisplayName)}"
alt="[${%cancel}]"/>
</j:if>
</td>
</tr></table>
...
...
core/src/main/resources/lib/hudson/buildCaption.properties
0 → 100644
浏览文件 @
3af3a271
confirm
=
Are you sure you want to abort {0}?
core/src/main/resources/lib/hudson/executors.jelly
浏览文件 @
3af3a271
...
...
@@ -110,7 +110,7 @@ THE SOFTWARE.
</st:include>
<td class="pane" align="center" valign="middle">
<j:if test="${e.hasStopPermission()}">
<l:stopButton href="${rootURL}/${c.url}${url}/stop"
alt="${%terminate this build}"
/>
<l:stopButton href="${rootURL}/${c.url}${url}/stop"
confirm="${%confirm(exe.fullDisplayName)}" alt="${%terminate this build}"
/>
</j:if>
</td>
</j:otherwise>
...
...
core/src/main/resources/lib/hudson/executors.properties
浏览文件 @
3af3a271
Computers
=
master{0,choice,0#|1# + {0,number} computer ({1} of {2} executors)|1< + {0,number} computers ({1} of {2} executors)}
confirm
=
Are you sure you want to abort {0}?
core/src/main/resources/lib/hudson/queue.jelly
浏览文件 @
3af3a271
...
...
@@ -91,7 +91,7 @@ THE SOFTWARE.
</td>
<td class="pane" width="16" align="center" valign="middle">
<j:if test="${item.hasCancelPermission()}">
<l:stopButton href="${rootURL}/queue/cancelItem?id=${item.id}" alt="cancel this build"/>
<l:stopButton href="${rootURL}/queue/cancelItem?id=${item.id}"
confirm="${%confirm(item.task.fullDisplayName)}"
alt="cancel this build"/>
</j:if>
</td>
</tr>
...
...
core/src/main/resources/lib/hudson/queue.properties
浏览文件 @
3af3a271
Build\
Queue
=
Build Queue{0,choice,0#|0< ({0,number})}
Filtered\
Build\
Queue
=
Filtered Build Queue{0,choice,0#|0< ({0,number})}
WaitingFor
=
Waiting for {0}
confirm
=
Are you sure you want to cancel the queued run of {0}?
core/src/main/resources/lib/layout/stopButton.jelly
浏览文件 @
3af3a271
...
...
@@ -33,8 +33,20 @@ THE SOFTWARE.
<st:attribute
name=
"alt"
use=
"required"
>
Alt text for image.
</st:attribute>
<st:attribute
name=
"confirm"
use=
"optional"
>
If defined, the user will be asked for confirmation first, and the value will be used as question.
</st:attribute>
</st:documentation>
<a
class=
"stop-button-link"
href=
"${href}"
onclick=
"new Ajax.Request(this.href); return false"
>
<j:choose>
<j:when
test=
"${confirm == null}"
>
<a
class=
"stop-button-link"
href=
"${href}"
onclick=
'new Ajax.Request("${href}"); return false;'
>
<l:icon
class=
"icon-stop icon-sm"
/>
</a>
</j:when>
<j:otherwise>
<a
class=
"stop-button-link"
href=
"${href}"
onclick=
'if(confirm("${confirm}"))new Ajax.Request("${href}"); return false;'
>
<l:icon
class=
"icon-stop icon-sm"
/>
</a>
</j:otherwise>
</j:choose>
</j:jelly>
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录