java/code/src/com/redhat/rhn/frontend/action/channels/ManagersSetupAction.java | 17 ++++------ java/spacewalk-java.spec | 5 ++ rel-eng/packages/spacewalk-java | 2 - 3 files changed, 13 insertions(+), 11 deletions(-)
New commits: commit 47f34097a0deeab1745de6b26ab8a3a1cc7a88b8 Author: Michael Mraka michael.mraka@redhat.com Date: Wed Dec 11 16:58:23 2013 +0100
Automatic commit of package [spacewalk-java] release [2.1.96-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 72c09f2..5a93ad9 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 2.1.95 +Version: 2.1.96 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -785,6 +785,9 @@ fi %{jardir}/postgresql-jdbc.jar
%changelog +* Wed Dec 11 2013 Michael Mraka michael.mraka@redhat.com 2.1.96-1 +- allow channel administrator to view Channel > Managers page + * Wed Dec 11 2013 Milan Zazrivec mzazrivec@redhat.com 2.1.95-1 - 1040540 - have package search return all matching results - use rhn:toolbar in 'Show Tomcat Logs' page diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 02f4cfb..f7170be 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.95-1 java/ +2.1.96-1 java/
commit 85f9d26ce9183b399439fd5ca0351741f4838289 Author: Michael Mraka michael.mraka@redhat.com Date: Wed Dec 11 16:41:12 2013 +0100
allow channel administrator to view Channel > Managers page
fixing You do not have sufficient permissions to perform this action.
com.redhat.rhn.common.security.PermissionException: Lookup user requires Org Admin at com.redhat.rhn.manager.user.UserManager.lookupUser(UserManager.java:529)
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channels/ManagersSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/channels/ManagersSetupAction.java index 577e5ab..9fc1286 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channels/ManagersSetupAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channels/ManagersSetupAction.java @@ -85,9 +85,9 @@ public class ManagersSetupAction extends RhnAction implements Listable { // remove channel managers for (Iterator<Long> iter = helper.getRemovedKeys().iterator(); iter.hasNext();) { - User u = UserManager.lookupUser(user, iter.next()); - if (!u.hasRole(RoleFactory.CHANNEL_ADMIN)) { - UserManager.removeChannelPerm(u, currentChan.getId(), + Long uid = iter.next(); + if (!UserManager.hasRole(uid, RoleFactory.CHANNEL_ADMIN)) { + user.getOrg().removeChannelPermissions(uid, currentChan.getId(), ChannelManager.QRY_ROLE_MANAGE); } updated++; @@ -95,11 +95,11 @@ public class ManagersSetupAction extends RhnAction implements Listable {
// add channel managers for (Iterator<Long> iter = helper.getAddedKeys().iterator(); iter.hasNext();) { - User u = UserManager.lookupUser(user, iter.next()); - if (!u.hasRole(RoleFactory.CHANNEL_ADMIN)) { - UserManager.removeChannelPerm(u, currentChan.getId(), + Long uid = iter.next(); + if (!UserManager.hasRole(uid, RoleFactory.CHANNEL_ADMIN)) { + user.getOrg().removeChannelPermissions(uid, currentChan.getId(), ChannelManager.QRY_ROLE_MANAGE); - UserManager.addChannelPerm(u, currentChan.getId(), + user.getOrg().resetChannelPermissions(uid, currentChan.getId(), ChannelManager.QRY_ROLE_MANAGE); } updated++; @@ -123,8 +123,7 @@ public class ManagersSetupAction extends RhnAction implements Listable { User currentUser = context.getCurrentUser(); List<UserOverview> userList = UserManager.activeInOrg2(currentUser); for (UserOverview uo : userList) { - User u = UserManager.lookupUser(currentUser, uo.getId()); - uo.setDisabled(u.hasRole(RoleFactory.CHANNEL_ADMIN)); + uo.setDisabled(UserManager.hasRole(uo.getId(), RoleFactory.CHANNEL_ADMIN)); } return userList; }
spacewalk-commits@lists.fedorahosted.org