rel-eng/packages/spacewalk-web | 2 +-
web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml | 7 ++++---
web/spacewalk-web.spec | 5 ++++-
3 files changed, 9 insertions(+), 5 deletions(-)
New commits:
commit d4e00c0bfff23eac7990adf1cbb2e0afc211b162
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Aug 30 11:35:15 2013 +0200
Automatic commit of package [spacewalk-web] release [2.1.16-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 3a077ac..2b26a75 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-2.1.15-1 web/
+2.1.16-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 1a7403d..99472c7 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -4,7 +4,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 2.1.15
+Version: 2.1.16
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk/
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -272,6 +272,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Fri Aug 30 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.16-1
+- 1002905 - fix ISE on /network/systems/system_list/flex_in_channel_family.pxt
+
* Fri Aug 30 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.15-1
- 1001826 - restrictions to channel name (update)
commit e44c2a317476172a9ff16a093c49a40f33a269cd
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Aug 30 11:26:51 2013 +0200
1002905 - fix ISE on /network/systems/system_list/flex_in_channel_family.pxt
addressing:
RHN::Exception: DBD::Pg::st execute failed: ERROR: for SELECT DISTINCT, ORDER BY
expressions must appear in select list
LINE 12: ORDER BY UPPER(NVL(S.NAME, '(none)')), S.ID
^
RHN::DB /usr/share/perl5/vendor_perl/RHN/DB.pm 122 RHN::Exception::DB::throw
RHN::DB::st /usr/share/perl5/vendor_perl/RHN/DB.pm 456 RHN::DB::handle_error
RHN::DB::DataSource /usr/share/perl5/vendor_perl/RHN/DB/DataSource.pm 75
RHN::DB::st::execute_h
RHN::DataSource /usr/share/perl5/vendor_perl/RHN/DataSource.pm 108
RHN::DB::DataSource::run_query
Sniglets::ListView::List /usr/share/perl5/vendor_perl/Sniglets/ListView/List.pm 1211
RHN::DataSource::execute_query
Sniglets::ListView::List /usr/share/perl5/vendor_perl/Sniglets/ListView/List.pm 908
Sniglets::ListView::List::default_provider
Sniglets::Lists /usr/share/perl5/vendor_perl/Sniglets/Lists.pm 119
Sniglets::ListView::List::render
PXT::Parser /usr/share/perl5/vendor_perl/PXT/Parser.pm 160
Sniglets::Lists::listview
PXT::Parser /usr/share/perl5/vendor_perl/PXT/Parser.pm 72 PXT::Parser::expand_tag
PXT::ApacheHandler /usr/share/perl5/vendor_perl/PXT/ApacheHandler.pm 489
PXT::Parser::expand_tags
PXT::ApacheHandler /usr/share/perl5/vendor_perl/PXT/ApacheHandler.pm 103
PXT::ApacheHandler::pxt_parse_data
PXT::ApacheHandler /usr/share/perl5/vendor_perl/PXT/ApacheHandler.pm 103 (eval)
main -e 0 PXT::ApacheHandler::handler
main -e 0 (eval)
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
index c90d4c4..e8d08f0 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
@@ -814,7 +814,8 @@ ORDER BY UPPER(NVL(X.NAME, '(none)')), X.ID
<mode name="flex_systems_in_channel_family">
<query params="org_id, cfam_id, user_id">
-SELECT distinct S.id, S.name
+SELECT * FROM (
+ SELECT distinct S.id, S.name
FROM rhnServer S,
rhnServerChannel SC,
rhnChannelFamilyMembers CFM
@@ -823,8 +824,8 @@ SELECT distinct S.id, S.name
AND SC.channel_id = CFM.channel_id
AND SC.is_fve = 'Y'
AND CFM.channel_family_id = :cfam_id
- AND EXISTS (SELECT 1 FROM rhnUserServerPerms USP WHERE USP.user_id = :user_id AND
USP.server_id = S.id)
-ORDER BY UPPER(NVL(S.NAME, '(none)')), S.ID
+ AND EXISTS (SELECT 1 FROM rhnUserServerPerms USP WHERE USP.user_id = :user_id AND
USP.server_id = S.id)) X
+ORDER BY UPPER(NVL(X.NAME, '(none)')), X.ID
</query>
<elaborator name="system_overview" />
<elaborator name="entitlements"/>