Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
d2eb07d9
J
jenkins
项目概览
xxadev
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
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,发现更多精彩内容 >>
提交
d2eb07d9
编写于
3月 25, 2016
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make ViewDescriptor.doAutoCompleteCopyNewItemFrom honor DirectlyModifiableTopLevelItemGroup.canAdd.
上级
21ffd868
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
42 addition
and
4 deletion
+42
-4
core/src/main/java/hudson/model/AutoCompletionCandidates.java
.../src/main/java/hudson/model/AutoCompletionCandidates.java
+8
-4
test/src/test/java/hudson/model/AutoCompletionCandidatesTest.java
.../test/java/hudson/model/AutoCompletionCandidatesTest.java
+34
-0
未找到文件。
core/src/main/java/hudson/model/AutoCompletionCandidates.java
浏览文件 @
d2eb07d9
...
...
@@ -37,6 +37,7 @@ import java.util.ArrayList;
import
java.util.Arrays
;
import
java.util.List
;
import
javax.annotation.CheckForNull
;
import
jenkins.model.DirectlyModifiableTopLevelItemGroup
;
/**
* Data representation of the auto-completion candidates.
...
...
@@ -106,7 +107,7 @@ public class AutoCompletionCandidates implements HttpResponse {
* The nearby contextual {@link ItemGroup} to resolve relative job names from.
* @since 1.553
*/
public
static
<
T
extends
Item
>
AutoCompletionCandidates
ofJobNames
(
final
Class
<
T
>
type
,
final
String
value
,
ItemGroup
container
)
{
public
static
<
T
extends
Item
>
AutoCompletionCandidates
ofJobNames
(
final
Class
<
T
>
type
,
final
String
value
,
final
ItemGroup
container
)
{
final
AutoCompletionCandidates
candidates
=
new
AutoCompletionCandidates
();
class
Visitor
extends
ItemVisitor
{
String
prefix
;
...
...
@@ -127,8 +128,10 @@ public class AutoCompletionCandidates implements HttpResponse {
&&
i
.
hasPermission
(
Item
.
READ
)
// and read permission required
)
{
if
(
type
.
isInstance
(
i
)
&&
n
.
startsWith
(
value
))
if
(
type
.
isInstance
(
i
)
&&
n
.
startsWith
(
value
)
&&
(!(
container
instanceof
DirectlyModifiableTopLevelItemGroup
)
||
!(
i
instanceof
TopLevelItem
)
||
((
DirectlyModifiableTopLevelItemGroup
)
container
).
canAdd
((
TopLevelItem
)
i
)))
{
candidates
.
add
(
n
);
}
// recurse
String
oldPrefix
=
prefix
;
...
...
@@ -153,9 +156,10 @@ public class AutoCompletionCandidates implements HttpResponse {
if
(
value
.
startsWith
(
"/"
))
new
Visitor
(
"/"
).
onItemGroup
(
Jenkins
.
getInstance
());
ItemGroup
parentContainer
=
container
;
for
(
String
p
=
"../"
;
value
.
startsWith
(
p
);
p
+=
"../"
)
{
container
=
((
Item
)
c
ontainer
).
getParent
();
new
Visitor
(
p
).
onItemGroup
(
c
ontainer
);
parentContainer
=
((
Item
)
parentC
ontainer
).
getParent
();
new
Visitor
(
p
).
onItemGroup
(
parentC
ontainer
);
}
}
...
...
test/src/test/java/hudson/model/AutoCompletionCandidatesTest.java
浏览文件 @
d2eb07d9
...
...
@@ -12,6 +12,9 @@ import org.jvnet.hudson.test.JenkinsRule;
import
java.util.Arrays
;
import
java.util.TreeSet
;
import
jenkins.model.DirectlyModifiableTopLevelItemGroup
;
import
org.jvnet.hudson.test.MockFolder
;
import
org.jvnet.hudson.test.TestExtension
;
/**
* @author Kohsuke Kawaguchi
...
...
@@ -60,6 +63,37 @@ public class AutoCompletionCandidatesTest {
assertContains
(
c
,
"../bar"
,
"../foo"
);
}
/** Checks that {@link ViewDescriptor#doAutoCompleteCopyNewItemFrom} honors {@link DirectlyModifiableTopLevelItemGroup#canAdd}. */
@Test
public
void
canAdd
()
throws
Exception
{
MockFolder
d1
=
j
.
createFolder
(
"d1"
);
d1
.
createProject
(
MockFolder
.
class
,
"sub"
);
d1
.
createProject
(
FreeStyleProject
.
class
,
"prj"
);
MockFolder
d2
=
j
.
jenkins
.
createProject
(
RestrictiveFolder
.
class
,
"d2"
);
assertContains
(
AutoCompletionCandidates
.
ofJobNames
(
TopLevelItem
.
class
,
"../d1/"
,
d2
),
"../d1/prj"
);
}
public
static
class
RestrictiveFolder
extends
MockFolder
{
public
RestrictiveFolder
(
ItemGroup
parent
,
String
name
)
{
super
(
parent
,
name
);
}
@Override
public
boolean
canAdd
(
TopLevelItem
item
)
{
return
item
instanceof
FreeStyleProject
;
}
@TestExtension
(
"canAdd"
)
public
static
class
DescriptorImpl
extends
TopLevelItemDescriptor
{
@Override
public
TopLevelItem
newInstance
(
ItemGroup
parent
,
String
name
)
{
return
new
RestrictiveFolder
(
parent
,
name
);
}
}
}
private
void
assertContains
(
AutoCompletionCandidates
c
,
String
...
values
)
{
assertEquals
(
new
TreeSet
<
String
>(
Arrays
.
asList
(
values
)),
new
TreeSet
<
String
>(
c
.
getValues
()));
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录