Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
fbb2bca3
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,发现更多精彩内容 >>
提交
fbb2bca3
编写于
12月 29, 2012
作者:
K
Kohsuke Kawaguchi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Using <f:bottomButtonBar> in more places.
Plus fixing the wrong apply button handling in various code.
上级
b88c996d
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
19 addition
and
12 deletion
+19
-12
core/src/main/java/hudson/model/ComputerSet.java
core/src/main/java/hudson/model/ComputerSet.java
+4
-2
core/src/main/java/hudson/model/Run.java
core/src/main/java/hudson/model/Run.java
+2
-1
core/src/main/java/hudson/model/User.java
core/src/main/java/hudson/model/User.java
+2
-1
core/src/main/java/hudson/model/View.java
core/src/main/java/hudson/model/View.java
+2
-1
core/src/main/resources/hudson/model/Computer/configure.jelly
.../src/main/resources/hudson/model/Computer/configure.jelly
+2
-2
core/src/main/resources/hudson/model/ComputerSet/configure.jelly
...c/main/resources/hudson/model/ComputerSet/configure.jelly
+4
-3
core/src/main/resources/hudson/model/Run/configure.jelly
core/src/main/resources/hudson/model/Run/configure.jelly
+3
-2
未找到文件。
core/src/main/java/hudson/model/ComputerSet.java
浏览文件 @
fbb2bca3
...
...
@@ -33,8 +33,10 @@ import hudson.model.listeners.SaveableListener;
import
hudson.node_monitors.NodeMonitor
;
import
hudson.slaves.NodeDescriptor
;
import
hudson.util.DescribableList
;
import
hudson.util.FormApply
;
import
hudson.util.FormValidation
;
import
jenkins.model.Jenkins
;
import
org.kohsuke.stapler.HttpResponse
;
import
org.kohsuke.stapler.QueryParameter
;
import
org.kohsuke.stapler.StaplerRequest
;
import
org.kohsuke.stapler.StaplerResponse
;
...
...
@@ -315,7 +317,7 @@ public final class ComputerSet extends AbstractModelObject implements Describabl
* Accepts submission from the configuration page.
*/
@RequirePOST
public
synchronized
void
doConfigSubmit
(
StaplerRequest
req
,
StaplerResponse
rsp
)
throws
IOException
,
ServletException
,
FormException
{
public
synchronized
HttpResponse
doConfigSubmit
(
StaplerRequest
req
)
throws
IOException
,
ServletException
,
FormException
{
BulkChange
bc
=
new
BulkChange
(
MONITORS_OWNER
);
try
{
Jenkins
.
getInstance
().
checkPermission
(
Jenkins
.
ADMINISTER
);
...
...
@@ -334,7 +336,7 @@ public final class ComputerSet extends AbstractModelObject implements Describabl
nm
.
triggerUpdate
();
}
r
sp
.
sendRedirect2
(
"."
);
r
eturn
FormApply
.
success
(
"."
);
}
finally
{
bc
.
commit
();
}
...
...
core/src/main/java/hudson/model/Run.java
浏览文件 @
fbb2bca3
...
...
@@ -54,6 +54,7 @@ import hudson.tasks.BuildWrapper;
import
hudson.tasks.BuildStep
;
import
hudson.tasks.test.AbstractTestResultAction
;
import
hudson.util.FlushProofOutputStream
;
import
hudson.util.FormApply
;
import
hudson.util.IOException2
;
import
hudson.util.LogTaskListener
;
import
hudson.util.XStream2
;
...
...
@@ -2052,7 +2053,7 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
}
finally
{
bc
.
abort
();
}
return
HttpResponses
.
redirectToDot
(
);
return
FormApply
.
success
(
"."
);
}
protected
void
submit
(
JSONObject
json
)
throws
IOException
{
...
...
core/src/main/java/hudson/model/User.java
浏览文件 @
fbb2bca3
...
...
@@ -33,6 +33,7 @@ import hudson.security.ACL;
import
hudson.security.AccessControlled
;
import
hudson.security.Permission
;
import
hudson.security.SecurityRealm
;
import
hudson.util.FormApply
;
import
hudson.util.RunList
;
import
hudson.util.XStream2
;
import
jenkins.model.Jenkins
;
...
...
@@ -529,7 +530,7 @@ public class User extends AbstractModelObject implements AccessControlled, Descr
save
();
rsp
.
sendRedirect
(
"."
);
FormApply
.
success
(
"."
).
generateResponse
(
req
,
rsp
,
this
);
}
/**
...
...
core/src/main/java/hudson/model/View.java
浏览文件 @
fbb2bca3
...
...
@@ -49,6 +49,7 @@ import hudson.util.AlternativeUiTextProvider;
import
hudson.util.AlternativeUiTextProvider.Message
;
import
hudson.util.DescribableList
;
import
hudson.util.DescriptorList
;
import
hudson.util.FormApply
;
import
hudson.util.IOException2
;
import
hudson.util.RunList
;
import
hudson.util.XStream2
;
...
...
@@ -902,7 +903,7 @@ public abstract class View extends AbstractModelObject implements AccessControll
save
();
rsp
.
sendRedirect2
(
"../"
+
name
);
FormApply
.
success
(
"../"
+
name
).
generateResponse
(
req
,
rsp
,
this
);
}
/**
...
...
core/src/main/resources/hudson/model/Computer/configure.jelly
浏览文件 @
fbb2bca3
...
...
@@ -42,9 +42,9 @@ THE SOFTWARE.
<!-- main body of the configuration -->
<st:include it="${instance}" page="configure-entries.jelly" />
<f:b
lock
>
<f:b
ottomButtonBar
>
<f:submit value="${%Save}"/>
</f:b
lock
>
</f:b
ottomButtonBar
>
</f:form>
</l:main-panel>
</l:layout>
...
...
core/src/main/resources/hudson/model/ComputerSet/configure.jelly
浏览文件 @
fbb2bca3
...
...
@@ -39,9 +39,10 @@ THE SOFTWARE.
descriptors="${it.nodeMonitorDescriptors}"
instances="${it.nonIgnoredMonitors}" />
<f:block>
<f:submit value="OK" />
</f:block>
<f:bottomButtonBar>
<f:submit value="${%OK}" />
<f:apply />
</f:bottomButtonBar>
</f:form>
</l:main-panel>
</l:layout>
...
...
core/src/main/resources/hudson/model/Run/configure.jelly
浏览文件 @
fbb2bca3
...
...
@@ -37,9 +37,10 @@ THE SOFTWARE.
</f:entry>
<j:if test="${h.hasPermission(it,it.UPDATE)}">
<f:b
lock
>
<f:b
ottomButtonBar
>
<f:submit value="${%Save}" />
</f:block>
<f:apply />
</f:bottomButtonBar>
</j:if>
</f:form>
</l:main-panel>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录