Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
CSDN专家-深度学习进阶
jenkins
提交
77a97460
J
jenkins
项目概览
CSDN专家-深度学习进阶
/
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,发现更多精彩内容 >>
提交
77a97460
编写于
1月 03, 2012
作者:
K
Kohsuke Kawaguchi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
various trivial nit-picking
上级
83bc1142
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
11 addition
and
35 deletion
+11
-35
core/src/main/java/hudson/Util.java
core/src/main/java/hudson/Util.java
+1
-2
core/src/main/java/hudson/model/AbstractItem.java
core/src/main/java/hudson/model/AbstractItem.java
+1
-1
core/src/main/java/hudson/model/Job.java
core/src/main/java/hudson/model/Job.java
+2
-17
core/src/main/resources/hudson/model/AbstractItem/configure-common.jelly
...esources/hudson/model/AbstractItem/configure-common.jelly
+2
-3
core/src/main/resources/hudson/model/AbstractItem/help-displayName.html
...resources/hudson/model/AbstractItem/help-displayName.html
+0
-0
core/src/test/java/hudson/model/JobTest.java
core/src/test/java/hudson/model/JobTest.java
+5
-12
未找到文件。
core/src/main/java/hudson/Util.java
浏览文件 @
77a97460
...
...
@@ -474,8 +474,7 @@ public class Util {
}
public
static
String
nullify
(
String
v
)
{
if
(
v
!=
null
&&
v
.
length
()==
0
)
v
=
null
;
return
v
;
return
fixEmpty
(
v
);
}
public
static
String
removeTrailingSlash
(
String
s
)
{
...
...
core/src/main/java/hudson/model/AbstractItem.java
浏览文件 @
77a97460
...
...
@@ -153,7 +153,7 @@ public abstract class AbstractItem extends Actionable implements Item, HttpDelet
}
public
void
setDisplayName
(
String
displayName
)
throws
IOException
{
this
.
displayName
=
displayName
;
this
.
displayName
=
Util
.
fixEmpty
(
displayName
)
;
save
();
}
...
...
core/src/main/java/hudson/model/Job.java
浏览文件 @
77a97460
...
...
@@ -941,21 +941,6 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
return
null
;
}
/**
* Takes the displayName request parameter and sets it into the the
* displayName member variable. If the displayName request parameter is a
* 0 length string, then set the displayName member variable to null.
* @param req
* @throws IOException
*/
void
setDisplayNameFromRequest
(
StaplerRequest
req
)
throws
IOException
{
String
displayName
=
req
.
getParameter
(
"displayName"
);
// if displayName is an empty string, just make it null so that we
// use the project name
displayName
=
Util
.
nullify
(
displayName
);
setDisplayName
(
displayName
);
}
//
//
// actions
...
...
@@ -973,11 +958,11 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
keepDependencies
=
req
.
getParameter
(
"keepDependencies"
)
!=
null
;
setDisplayNameFromRequest
(
req
);
try
{
JSONObject
json
=
req
.
getSubmittedForm
();
setDisplayName
(
json
.
optString
(
"displayNameOrNull"
));
if
(
req
.
getParameter
(
"logrotate"
)
!=
null
)
logRotator
=
LogRotator
.
DESCRIPTOR
.
newInstance
(
req
,
json
.
getJSONObject
(
"logrotate"
));
else
...
...
core/src/main/resources/hudson/model/AbstractItem/configure-common.jelly
浏览文件 @
77a97460
...
...
@@ -64,9 +64,8 @@ THE SOFTWARE.
<p:config-blockWhenUpstreamBuilding />
<p:config-blockWhenDownstreamBuilding />
<st:include page="configure-advanced.jelly" optional="true" />
<f:entry title="${%Display Name}" help="/help/project-config/displayName.html">
<f:textbox name="displayName" value="${it.displayNameOrNull}"
checkUrl="'${rootURL}/checkDisplayName?displayName='+escape(this.value)+'&jobName=${it.name}'"/>
<f:entry title="${%Display Name}" field="displayNameOrNull">
<f:textbox checkUrl="'${rootURL}/checkDisplayName?displayName='+escape(this.value)+'&jobName=${it.name}'"/>
</f:entry>
</f:advanced>
...
...
war/src/main/webapp/help/project-config/
displayName.html
→
core/src/main/resources/hudson/model/AbstractItem/help-
displayName.html
浏览文件 @
77a97460
文件已移动
core/src/test/java/hudson/model/JobTest.java
浏览文件 @
77a97460
...
...
@@ -15,13 +15,10 @@ public class JobTest {
@Test
public
void
testSetDisplayName
()
throws
Exception
{
final
String
displayName
=
"testSetDisplayName"
;
// create a mock stapler request that returns a display name
StaplerRequest
req
=
Mockito
.
mock
(
StaplerRequest
.
class
);
Mockito
.
when
(
req
.
getParameter
(
DISPLAY_NAME_PARAMETER_NAME
)).
thenReturn
(
displayName
);
StubJob
j
=
new
StubJob
();
// call setDisplayNameFromRequest
j
.
setDisplayName
FromRequest
(
req
);
j
.
setDisplayName
OrNull
(
displayName
);
// make sure the displayname has been set
Assert
.
assertEquals
(
displayName
,
j
.
getDisplayName
());
...
...
@@ -29,14 +26,10 @@ public class JobTest {
@Test
public
void
testSetDisplayNameZeroLength
()
throws
Exception
{
// create a mock stapler request that returns a ""
StaplerRequest
req
=
Mockito
.
mock
(
StaplerRequest
.
class
);
Mockito
.
when
(
req
.
getParameter
(
DISPLAY_NAME_PARAMETER_NAME
)).
thenReturn
(
""
);
StubJob
j
=
new
StubJob
();
StubJob
j
=
new
StubJob
();
// call setDisplayNameFromRequest
j
.
setDisplayName
FromRequest
(
req
);
j
.
setDisplayName
OrNull
(
""
);
// make sure the getDisplayName returns the project name
Assert
.
assertEquals
(
StubJob
.
DEFAULT_STUB_JOB_NAME
,
j
.
getDisplayName
());
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录