java/code/src/com/redhat/rhn/common/security/acl/BaseHandler.java | 11 ++++++++++
java/code/webapp/WEB-INF/nav/channel_tabs.xml | 2 -
java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 2 -
3 files changed, 13 insertions(+), 2 deletions(-)
New commits:
commit 2a215ec3108e53f6b977bb705f6152a0cc50dbc1
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Jan 27 18:42:50 2010 -0500
506950 - fixing issue where RedHat channels tab would show up for spacewalk users
diff --git a/java/code/src/com/redhat/rhn/common/security/acl/BaseHandler.java
b/java/code/src/com/redhat/rhn/common/security/acl/BaseHandler.java
index 6c214fe..c7db4f3 100644
--- a/java/code/src/com/redhat/rhn/common/security/acl/BaseHandler.java
+++ b/java/code/src/com/redhat/rhn/common/security/acl/BaseHandler.java
@@ -44,6 +44,17 @@ public abstract class BaseHandler implements AclHandler {
/**
+ * returns true if satellite, false if spacewalk
+ * @param ctx Our current context, containing a crid or cfid.
+ * @param params nothing
+ * @return true if satellite, false if spacewalk
+ */
+ public boolean aclIsSatellite(Object ctx, String[] params) {
+ return !ConfigDefaults.get().isSpacewalk();
+ }
+
+
+ /**
* Returns a Long object from the given object. We expect
* a String[] or String as the input all others return null;
* @param o object to be converted
diff --git a/java/code/webapp/WEB-INF/nav/channel_tabs.xml
b/java/code/webapp/WEB-INF/nav/channel_tabs.xml
index 3eb4942..3a18a55 100644
--- a/java/code/webapp/WEB-INF/nav/channel_tabs.xml
+++ b/java/code/webapp/WEB-INF/nav/channel_tabs.xml
@@ -4,7 +4,7 @@
<rhn-tab name="channel.nav.all">
<rhn-tab-url>/rhn/software/channels/All.do</rhn-tab-url>
</rhn-tab>
- <rhn-tab name="channel.nav.redhat">
+ <rhn-tab name="channel.nav.redhat" acl="is_satellite()">
<rhn-tab-url>/rhn/software/channels/RedHat.do</rhn-tab-url>
</rhn-tab>
<rhn-tab name="channel.nav.popular">
diff --git a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
index a427be3..daa0725 100644
--- a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
+++ b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml
@@ -126,7 +126,7 @@
<rhn-tab name="Software Channels"
url="/rhn/software/channels/All.do">
<rhn-tab-directory>/rhn/channels</rhn-tab-directory>
<rhn-tab name="channel.nav.all"
url="/rhn/software/channels/All.do"/>
- <rhn-tab name="channel.nav.redhat"
url="/rhn/software/channels/RedHat.do"/>
+ <rhn-tab name="channel.nav.redhat"
url="/rhn/software/channels/RedHat.do" acl="is_satellite()"/>
<rhn-tab name="channel.nav.popular"
url="/rhn/software/channels/Popular.do"/>
<rhn-tab name="channel.nav.custom"
url="/rhn/software/channels/Custom.do"/>
<rhn-tab name="channel.nav.shared"
url="/rhn/software/channels/Shared.do"/>
Show replies by date