java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit a98d58387151826a01f3a489b00f1c5e7b79ad2e
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Aug 3 12:30:52 2009 -0400
496080 - fixing issue where if the rhn tools beta channel was synced, you would get an
ISE when trying to give the virt entitlement within an org that did not have access to
that channel
the query was basically using the wrong view and doing some incorrect logic
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
index 6dc72be..59a1538 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
@@ -1040,9 +1040,9 @@ SELECT DISTINCT C.id
AND CP.package_id = P.id
AND P.name_id = PN.id
AND PN.name = :package
- AND (C.org_id = :org_id OR C.org_id IS NULL OR EXISTS (
- SELECT 1 FROM rhnSharedChannelView SCV
- WHERE SCV.id = C.id AND SCV.org_trust_id = :org_id))
+ AND EXISTS (
+ SELECT 1 FROM rhnAvailableChannels AC
+ WHERE AC.channel_id = C.id AND AC.org_id = :org_id)
</query>
</mode>
Show replies by date