java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
New commits: commit 24af51ccd924f89aaa8b9424dd078c3c437073db Author: jesus m. rodriguez jesusr@redhat.com Date: Thu Aug 13 16:16:05 2009 -0400
517421 - allow shared base channels to used as parents in channel creation.
diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml index 425bccd..e67443b 100644 --- a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml +++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml @@ -148,10 +148,13 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" <sql-query name="Channel.findAllBaseChannels"> <![CDATA[SELECT {c.*} FROM rhnChannel {c}, - rhnChannelCloned c_1_ - WHERE c.parent_channel is null - AND c.id = c_1_.id (+) - AND 1 IN (SELECT rhn_channel.get_org_access(c.id, :org_id) from dual)]]> + rhnUserChannel uc, + rhnChannelCloned c_1_ + WHERE c.id = uc.channel_id + AND c.id = c_1_.id (+) + AND uc.org_id = :org_id + AND uc.role = 'subscribe' + AND c.parent_channel is null]]> <return alias="c" class="com.redhat.rhn.domain.channel.Channel" /> </sql-query>
spacewalk-commits@lists.fedorahosted.org