Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Foster2013-07-12 19:37:55 -0400
committerBob Foster2013-07-12 19:37:55 -0400
commit059de483f70f5a64ada170a00ac905206b5b1252 (patch)
treefac58880720daaf622a796e13cf805e42cad60d3 /hudson-core/src/main/resources/hudson/model
parentd693cf052f831c15547bd1b831986fb1de253283 (diff)
downloadorg.eclipse.hudson.core-059de483f70f5a64ada170a00ac905206b5b1252.tar.gz
org.eclipse.hudson.core-059de483f70f5a64ada170a00ac905206b5b1252.tar.xz
org.eclipse.hudson.core-059de483f70f5a64ada170a00ac905206b5b1252.zip
Fix 412720 admin in two or more teams can manage all
Diffstat (limited to 'hudson-core/src/main/resources/hudson/model')
-rw-r--r--hudson-core/src/main/resources/hudson/model/View/sidepanel.jelly14
1 files changed, 7 insertions, 7 deletions
diff --git a/hudson-core/src/main/resources/hudson/model/View/sidepanel.jelly b/hudson-core/src/main/resources/hudson/model/View/sidepanel.jelly
index 1c24afa0..c4e7bf10 100644
--- a/hudson-core/src/main/resources/hudson/model/View/sidepanel.jelly
+++ b/hudson-core/src/main/resources/hudson/model/View/sidepanel.jelly
@@ -31,13 +31,13 @@
<l:task icon="images/24x24/new-package.png" href="${rootURL}/${it.viewUrl}newJob" title="${%New Job}" permission="${it.itemCreatePermission}" it="${app}" />
<l:task icon="images/24x24/setting.png" href="${rootURL}/manage" title="${%Manage Hudson}" permission="${app.ADMINISTER}" it="${app}" />
- <j:if test="${app.isTeamManagementEnabled()}">
- <j:if test="${app.teamManager.isCurrentUserSysAdmin()}">
- <l:task icon="images/24x24/user.png" href="${rootURL}/teamManager" title="${%Manage Teams}"/>
- </j:if>
- <j:if test="${app.teamManager.isCurrentUserTeamAdmin() &amp;&amp; !app.teamManager.isCurrentUserSysAdmin()}">
- <l:task icon="images/24x24/user.png" href="${rootURL}/teamManager" title="${%Manage Team}"/>
- </j:if>
+ <j:if test="${app.isTeamManagementEnabled()}">
+ <j:if test="${app.teamManager.currentUserAdminInMultipleTeams}">
+ <l:task icon="images/24x24/user.png" href="${rootURL}/teamManager" title="${%Manage Teams}"/>
+ </j:if>
+ <j:if test="${app.teamManager.currentUserAdminInSingleTeam}">
+ <l:task icon="images/24x24/user.png" href="${rootURL}/teamManager" title="${%Manage Team}"/>
+ </j:if>
</j:if>
<j:choose>
<j:when test="${it.class.name=='hudson.model.AllView'}">

Back to the top