Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakozak2011-11-25 05:46:38 -0500
committerWinston Prakash2011-12-01 20:47:37 -0500
commit13e9ad22daffefaf2dc3b1948a3003455a194f42 (patch)
treec560698b8a9b7b9cfda05ef1e448d648b75ac0d3 /hudson-core/src/main/resources/hudson
parentbf4f6110b1facba137021e52b379342e194a7176 (diff)
downloadorg.eclipse.hudson.core-13e9ad22daffefaf2dc3b1948a3003455a194f42.tar.gz
org.eclipse.hudson.core-13e9ad22daffefaf2dc3b1948a3003455a194f42.tar.xz
org.eclipse.hudson.core-13e9ad22daffefaf2dc3b1948a3003455a194f42.zip
Merged missed fix for HUDSON-8916 Add "hudson.security.WipeOutPermission" system property
Signed-off-by: Winston Prakash <winston.prakash@gmail.com>
Diffstat (limited to 'hudson-core/src/main/resources/hudson')
-rw-r--r--hudson-core/src/main/resources/hudson/model/AbstractProject/sidepanel.jelly2
-rw-r--r--hudson-core/src/main/resources/hudson/model/Messages.properties2
2 files changed, 3 insertions, 1 deletions
diff --git a/hudson-core/src/main/resources/hudson/model/AbstractProject/sidepanel.jelly b/hudson-core/src/main/resources/hudson/model/AbstractProject/sidepanel.jelly
index 65a13c83..e4e8e7c2 100644
--- a/hudson-core/src/main/resources/hudson/model/AbstractProject/sidepanel.jelly
+++ b/hudson-core/src/main/resources/hudson/model/AbstractProject/sidepanel.jelly
@@ -31,7 +31,7 @@
<l:task icon="images/24x24/search.png" href="${url}/" title="${%Status}" />
<l:task icon="images/24x24/notepad.png" href="${url}/changes" title="${%Changes}" />
<l:task icon="images/24x24/folder.png" href="${url}/ws/" title="${%Workspace}" permission="${it.WORKSPACE}">
- <l:task icon="images/24x24/folder-delete.png" href="${url}/wipeOutWorkspace" title="${%Wipe Out Workspace}" permission="${it.BUILD}" />
+ <l:task icon="images/24x24/folder-delete.png" href="${url}/wipeOutWorkspace" title="${%Wipe Out Workspace}" permission="${h.isWipeOutPermissionEnabled() ? it.WIPEOUT : it.BUILD}" />
</l:task>
<j:if test="${it.configurable}">
<j:if test="${it.buildable}">
diff --git a/hudson-core/src/main/resources/hudson/model/Messages.properties b/hudson-core/src/main/resources/hudson/model/Messages.properties
index 34d4ff9e..54d3c470 100644
--- a/hudson-core/src/main/resources/hudson/model/Messages.properties
+++ b/hudson-core/src/main/resources/hudson/model/Messages.properties
@@ -41,6 +41,8 @@ AbstractProject.WorkspacePermission.Description=\
This permission grants the ability to retrieve the contents of a workspace \
Hudson checked out for performing builds. If you don''t want an user to access \
the source code, you can do so by revoking this permission.
+ AbstractProject.WipeOutPermission.Description=\
+ This permission grants the ability to wipe out the contents of a workspace.
AbstractProject.ExtendedReadPermission.Description=\
This permission grants read-only access to project configurations. Please be \
aware that sensitive information in your builds, such as passwords, will be \

Back to the top