java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit 23583fe5c7b5b59285f2f6f4f98f2b9159b5ab93
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Tue Jun 25 08:57:23 2013 +0200
976371 - don't offer channels which system can't subscribe to
diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
index f6249e6..325eaf0 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
@@ -1995,7 +1995,10 @@ public class ChannelManager extends BaseManager {
channelDtos.addAll(listCustomBaseChannelsForServer(s));
for (DistChannelMap dcm : ChannelFactory.listCompatibleDcmByServerInNullOrg(s))
{
+ if (SystemManager.canServerSubscribeToChannel(
+ usr.getOrg(), s, dcm.getChannel())) {
channelDtos.add(new EssentialChannelDto(dcm.getChannel()));
+ }
}
return channelDtos;