web/modules/rhn/RHN/DB/ChannelEditor.pm | 2 +-
web/modules/rhn/RHN/DB/DataSource/xml/Channel_queries.xml | 10 ++++------
2 files changed, 5 insertions(+), 7 deletions(-)
New commits:
commit f858fc2ab93e6f03f61e10007f87123a87fbaf81
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 5 16:40:25 2010 +0200
Use case instead of decode, it is more portable.
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/Channel_queries.xml
b/web/modules/rhn/RHN/DB/DataSource/xml/Channel_queries.xml
index 5167e45..cef3b12 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/Channel_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/Channel_queries.xml
@@ -61,12 +61,10 @@ SELECT UNIQUE RD.category, RD.release_notes_url
SELECT AC.channel_id AS ID,
AC.channel_name AS NAME,
rhn_channel.user_role_check(AC.channel_id, :u_id, 'subscribe') AS
HAS_PERM,
- DECODE(
-rhn_channel.org_channel_setting(AC.channel_id,
:org_id,'not_globally_subscribable'),
-0,
-1,
-NULL
- ) AS GLOBALLY_SUBSCRIBABLE
+ case
+ when rhn_channel.org_channel_setting(AC.channel_id,
:org_id,'not_globally_subscribable') = 0 then 1
+ else null end
+ AS GLOBALLY_SUBSCRIBABLE
FROM rhnAvailableChannels AC
WHERE AC.org_id = :org_id
ORDER BY UPPER(AC.channel_name)
commit 580fc4e7bfd56dbae491cc3828d9f88a79007ae7
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Oct 5 16:27:58 2010 +0200
Mark aliases with AS. This is what PostgreSQL requires.
diff --git a/web/modules/rhn/RHN/DB/ChannelEditor.pm
b/web/modules/rhn/RHN/DB/ChannelEditor.pm
index a7db934..4977009 100644
--- a/web/modules/rhn/RHN/DB/ChannelEditor.pm
+++ b/web/modules/rhn/RHN/DB/ChannelEditor.pm
@@ -127,7 +127,7 @@ sub channels_visible_to_org_with_parent {
my $sth;
#Only display if there is a parent channel available See Bug 432650
$query = <<EOQ;
-SELECT ACh.channel_name NAME, ACh.channel_id ID, ACh.channel_depth DEPTH, C.org_id
CHANNEL_ORG_ID
+SELECT ACh.channel_name as NAME, ACh.channel_id as ID, ACh.channel_depth as DEPTH,
C.org_id as CHANNEL_ORG_ID
FROM rhnAvailableChannels ACh inner join
rhnChannel C on C.id = ACh.channel_id left outer join
rhnAvailableChannels ACh2 on C.parent_channel = ACh2.channel_id
Show replies by date