Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinston Prakash2014-06-25 16:05:04 -0400
committerWinston Prakash2014-06-25 16:05:04 -0400
commit296810fdeace165d9de6cbafb23ea29041371ac7 (patch)
tree4b77eaae6e31f8c6b69c59cbd333eb1ff05768e5 /hudson-core/src/main/resources/hudson
parentdfa80100516ea8b967b6a4992a032e3f1c4dab64 (diff)
downloadorg.eclipse.hudson.core-296810fdeace165d9de6cbafb23ea29041371ac7.tar.gz
org.eclipse.hudson.core-296810fdeace165d9de6cbafb23ea29041371ac7.tar.xz
org.eclipse.hudson.core-296810fdeace165d9de6cbafb23ea29041371ac7.zip
Fix: Team member with configure permission should be able to see slave log and disconnect the salve
Diffstat (limited to 'hudson-core/src/main/resources/hudson')
-rw-r--r--hudson-core/src/main/resources/hudson/slaves/SlaveComputer/log.jelly14
-rw-r--r--hudson-core/src/main/resources/hudson/slaves/SlaveComputer/sidepanel2.jelly8
2 files changed, 11 insertions, 11 deletions
diff --git a/hudson-core/src/main/resources/hudson/slaves/SlaveComputer/log.jelly b/hudson-core/src/main/resources/hudson/slaves/SlaveComputer/log.jelly
index a123186e..3d3e32ef 100644
--- a/hudson-core/src/main/resources/hudson/slaves/SlaveComputer/log.jelly
+++ b/hudson-core/src/main/resources/hudson/slaves/SlaveComputer/log.jelly
@@ -20,13 +20,13 @@
<l:layout title="${it.displayName} log" secured="true">
<st:include page="sidepanel.jelly" />
<l:main-panel>
- <l:isAdmin>
- <pre id="out" />
- <div id="spinner">
- <img src="${imagesURL}/spinner.gif" alt=""/>
- </div>
- <t:progressiveText href="logText/progressiveHtml" idref="out" spinner="spinner" />
- </l:isAdmin>
+ <j:if test="${h.hasPermission(it,it.CONFIGURE)}">
+ <pre id="out" />
+ <div id="spinner">
+ <img src="${imagesURL}/spinner.gif" alt=""/>
+ </div>
+ <t:progressiveText href="logText/progressiveHtml" idref="out" spinner="spinner" />
+ </j:if>
</l:main-panel>
</l:layout>
</j:jelly>
diff --git a/hudson-core/src/main/resources/hudson/slaves/SlaveComputer/sidepanel2.jelly b/hudson-core/src/main/resources/hudson/slaves/SlaveComputer/sidepanel2.jelly
index 8b63ead0..45895f29 100644
--- a/hudson-core/src/main/resources/hudson/slaves/SlaveComputer/sidepanel2.jelly
+++ b/hudson-core/src/main/resources/hudson/slaves/SlaveComputer/sidepanel2.jelly
@@ -18,10 +18,10 @@
<?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:isAdmin>
- <l:task icon="images/24x24/clipboard.png" href="log" title="${%Log}" />
<l:task icon="images/24x24/computer.png" href="systemInfo" title="${%System Information}" />
- <j:if test="${it.channel!=null}">
- <l:task icon="images/24x24/edit-delete.png" href="disconnect" title="${%Disconnect}" />
- </j:if>
</l:isAdmin>
+ <l:task icon="images/24x24/clipboard.png" href="log" title="${%Log}" permission="${it.CONFIGURE}"/>
+ <j:if test="${it.channel!=null}">
+ <l:task icon="images/24x24/edit-delete.png" href="disconnect" title="${%Disconnect}" permission="${it.CONFIGURE}"/>
+ </j:if>
</j:jelly>

Back to the top