Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
0ebd8a6c
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,发现更多精彩内容 >>
提交
0ebd8a6c
编写于
9月 26, 2013
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "[JENKINS-16502] Permission to see an executor/slave"
This reverts commit
647695e2
.
上级
42d2f3da
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
8 addition
and
21 deletion
+8
-21
changelog.html
changelog.html
+0
-3
core/src/main/java/hudson/model/Computer.java
core/src/main/java/hudson/model/Computer.java
+0
-4
core/src/main/java/jenkins/model/Jenkins.java
core/src/main/java/jenkins/model/Jenkins.java
+2
-7
core/src/main/resources/hudson/model/Computer/builds.jelly
core/src/main/resources/hudson/model/Computer/builds.jelly
+1
-1
core/src/main/resources/hudson/model/Computer/delete.jelly
core/src/main/resources/hudson/model/Computer/delete.jelly
+1
-1
core/src/main/resources/hudson/model/Computer/index.jelly
core/src/main/resources/hudson/model/Computer/index.jelly
+1
-1
core/src/main/resources/hudson/model/Computer/load-statistics.jelly
...ain/resources/hudson/model/Computer/load-statistics.jelly
+1
-1
core/src/main/resources/hudson/model/Computer/markOffline.jelly
...rc/main/resources/hudson/model/Computer/markOffline.jelly
+1
-1
core/src/main/resources/hudson/model/Computer/setOfflineCause.jelly
...ain/resources/hudson/model/Computer/setOfflineCause.jelly
+1
-1
core/src/main/resources/hudson/model/Messages.properties
core/src/main/resources/hudson/model/Messages.properties
+0
-1
未找到文件。
changelog.html
浏览文件 @
0ebd8a6c
...
...
@@ -71,9 +71,6 @@ Upcoming changes</a>
<li
class=
rfe
>
Offer alternate error message for pattern-based project naming strategy.
(
<a
href=
"https://github.com/jenkinsci/jenkins/pull/914"
>
pull request 914
</a>
)
<li
class=
rfe
>
Add support for hiding build slaves from users.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-16502"
>
issue 16502
</a>
)
</ul>
</div>
<!--=END=-->
<h3><a
name=
v1.532
>
What's new in 1.532
</a>
(2013/09/23)
</h3>
...
...
core/src/main/java/hudson/model/Computer.java
浏览文件 @
0ebd8a6c
...
...
@@ -1373,10 +1373,6 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
public
static
final
Permission
DISCONNECT
=
new
Permission
(
PERMISSIONS
,
"Disconnect"
,
Messages
.
_Computer_DisconnectPermission_Description
(),
Jenkins
.
ADMINISTER
,
PermissionScope
.
COMPUTER
);
public
static
final
Permission
CONNECT
=
new
Permission
(
PERMISSIONS
,
"Connect"
,
Messages
.
_Computer_ConnectPermission_Description
(),
DISCONNECT
,
PermissionScope
.
COMPUTER
);
public
static
final
Permission
BUILD
=
new
Permission
(
PERMISSIONS
,
"Build"
,
Messages
.
_Computer_BuildPermission_Description
(),
Permission
.
WRITE
,
PermissionScope
.
COMPUTER
);
/**
* @since 1.533
*/
public
static
final
Permission
VIEW
=
new
Permission
(
PERMISSIONS
,
"View"
,
Messages
.
_Computer_ViewPermission_Description
(),
Permission
.
READ
,
PermissionScope
.
COMPUTER
);
private
static
final
Logger
LOGGER
=
Logger
.
getLogger
(
Computer
.
class
.
getName
());
}
core/src/main/java/jenkins/model/Jenkins.java
浏览文件 @
0ebd8a6c
...
...
@@ -1533,12 +1533,7 @@ public class Jenkins extends AbstractCIBase implements ModifiableTopLevelItemGro
* Gets the read-only list of all {@link Computer}s.
*/
public
Computer
[]
getComputers
()
{
Collection
<
Computer
>
computers
=
new
ArrayList
<
Computer
>(
this
.
computers
.
size
());
for
(
Computer
c:
this
.
computers
.
values
())
{
if
(
c
.
hasPermission
(
Computer
.
VIEW
))
computers
.
add
(
c
);
}
Computer
[]
r
=
computers
.
toArray
(
new
Computer
[
computers
.
size
()]);
Computer
[]
r
=
computers
.
values
().
toArray
(
new
Computer
[
computers
.
size
()]);
Arrays
.
sort
(
r
,
new
Comparator
<
Computer
>()
{
final
Collator
collator
=
Collator
.
getInstance
();
public
int
compare
(
Computer
lhs
,
Computer
rhs
)
{
...
...
@@ -1557,7 +1552,7 @@ public class Jenkins extends AbstractCIBase implements ModifiableTopLevelItemGro
for
(
Computer
c
:
computers
.
values
())
{
if
(
c
.
getName
().
equals
(
name
))
return
c
.
hasPermission
(
Computer
.
VIEW
)
?
c
:
null
;
return
c
;
}
return
null
;
}
...
...
core/src/main/resources/hudson/model/Computer/builds.jelly
浏览文件 @
0ebd8a6c
...
...
@@ -24,7 +24,7 @@ THE SOFTWARE.
<?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.displayName}"
permission="${it.VIEW}"
>
<l:layout title="${it.displayName}">
<st:include page="sidepanel.jelly" />
<l:main-panel>
<h1>
...
...
core/src/main/resources/hudson/model/Computer/delete.jelly
浏览文件 @
0ebd8a6c
...
...
@@ -24,7 +24,7 @@ THE SOFTWARE.
<?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
permission="${it.DELETE}"
>
<l:layout>
<st:include page="sidepanel.jelly" />
<l:main-panel>
<form method="post" action="doDelete">
...
...
core/src/main/resources/hudson/model/Computer/index.jelly
浏览文件 @
0ebd8a6c
...
...
@@ -24,7 +24,7 @@ THE SOFTWARE.
<?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.displayName}"
permission="${it.VIEW}"
>
<l:layout title="${it.displayName}">
<st:include page="sidepanel.jelly" />
<l:main-panel>
...
...
core/src/main/resources/hudson/model/Computer/load-statistics.jelly
浏览文件 @
0ebd8a6c
...
...
@@ -24,7 +24,7 @@ THE SOFTWARE.
<?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.displayName} Load Statistics"
permission="${it.VIEW}"
>
<l:layout title="${it.displayName} Load Statistics">
<st:include page="sidepanel.jelly" />
<l:main-panel>
<st:include page="main.jelly" from="${it.loadStatistics}" />
...
...
core/src/main/resources/hudson/model/Computer/markOffline.jelly
浏览文件 @
0ebd8a6c
...
...
@@ -24,7 +24,7 @@ THE SOFTWARE.
<?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="${%title(it.displayName)}" norefresh="true"
permission="${it.VIEW}"
>
<l:layout title="${%title(it.displayName)}" norefresh="true">
<st:include page="sidepanel.jelly" />
<l:main-panel>
<l:hasPermission permission="${it.DISCONNECT}">
...
...
core/src/main/resources/hudson/model/Computer/setOfflineCause.jelly
浏览文件 @
0ebd8a6c
...
...
@@ -24,7 +24,7 @@ THE SOFTWARE.
<?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="${%title(it.displayName)}" norefresh="true"
permission="${it.VIEW}"
>
<l:layout title="${%title(it.displayName)}" norefresh="true">
<st:include page="sidepanel.jelly" />
<l:main-panel>
<l:hasPermission permission="${it.DISCONNECT}">
...
...
core/src/main/resources/hudson/model/Messages.properties
浏览文件 @
0ebd8a6c
...
...
@@ -109,7 +109,6 @@ Computer.CreatePermission.Description=This permission allows users to create sla
Computer.ConnectPermission.Description
=
This permission allows users to connect slaves or mark slaves as online.
Computer.DisconnectPermission.Description
=
This permission allows users to disconnect slaves or mark slaves as temporarily offline.
Computer.BuildPermission.Description
=
This permission allows users to run jobs as them on slaves.
Computer.ViewPermission.Description
=
This permission allows users to see the slaves.
Computer.BadChannel
=
Slave node offline or not a remote channel (such as master node).
ComputerSet.NoSuchSlave
=
No such slave: {0}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录