rel-eng/packages/spacewalk-web | 2 +-
web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml | 2 +-
web/spacewalk-web.spec | 5 ++++-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 10778981e560c1305147cc1ab2c4a4658718aecd
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jul 28 09:53:55 2011 +0200
Automatic commit of package [spacewalk-web] release [1.5.19-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index d627a92..df23f47 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.5.18-1 web/
+1.5.19-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 061be2c..f5c86eb 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.5.18
+Version: 1.5.19
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -257,6 +257,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Thu Jul 28 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.19-1
+- fixed ORA-00904 in remote commands
+
* Thu Jul 21 2011 Jan Pazdziora 1.5.18-1
- Sysdate replaced with current_timestamp (msuchy(a)redhat.com)
commit 81309fefa91994ad9426b306f7631a42310a4bed
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jul 27 09:07:31 2011 +0200
fixed ORA-00904 in remote commands
Error message:
RHN::Exception: DBD::Oracle::db prepare_cached failed: ORA-00904:
"X"."NAME":
invalid identifier (DBD ERROR: error possibly near <*> indicator at > char
614 in
'
select * from (
SELECT DISTINCT S.id,
S.name AS SERVER_NAME
FROM rhnServer S,
rhnClientCapabilityName CCN,
rhnClientCapability CC,
rhnSet ST,
rhnUserServerPerms USP
WHERE USP.user_id = :user_id
AND ST.user_id = :user_id
AND ST.label = 'system_list'
AND USP.server_id = ST.element
AND EXISTS(SELECT 1 FROM rhnServerFeaturesView SFV WHERE
SFV.server_id =
ST.element AND SFV.label = 'ftr_remote_command')
AND USP.server_id = CC.server_id
AND CC.capability_name_id = CCN.id
AND CCN.name = 'script.run'
AND USP.server_id = S.id
) X
ORDER BY UPPER(COALESCE(<*>X.name, '(none)')), X.id
(cherry picked from commit c6d8dda49e05d687116685c1642ea03069b6605d)
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 5b8cfb0..5a23d57 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
@@ -20,7 +20,7 @@ SELECT DISTINCT S.id,
AND CCN.name = 'script.run'
AND USP.server_id = S.id
) X
-ORDER BY UPPER(COALESCE(X.name, '(none)')), X.id
+ORDER BY UPPER(COALESCE(X.server_name, '(none)')), X.id
</query>
<elaborator name="system_overview" />