Changes to 'refs/tags/rhncfg-5.10.6-1'
by Jan Pazdziora
Tag 'rhncfg-5.10.6-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-31 14:03 +0000
Tagging package [rhncfg] version [5.10.6-1] in directory [client/tools/rhncfg/].
Changes since rhn-client-tools-1.5.9-1:
Jan Pazdziora (1):
Automatic commit of package [rhncfg] release [5.10.6-1].
---
client/tools/rhncfg/rhncfg.spec | 5 ++++-
rel-eng/packages/rhncfg | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
12 years
client/tools rel-eng/packages
by Jan Pazdziora
client/tools/rhncfg/rhncfg.spec | 5 ++++-
rel-eng/packages/rhncfg | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit b1eda3944c7a4d0522bff1e493de9154a2a0e105
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 31 16:03:03 2011 +0200
Automatic commit of package [rhncfg] release [5.10.6-1].
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 20c3e9b..ec949fe 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -8,7 +8,7 @@ Group: Applications/System
License: GPLv2 and Python
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.10.5
+Version: 5.10.6
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -104,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Tue May 31 2011 Jan Pazdziora 5.10.6-1
+- Fix python import (matteo.sessa(a)dbmsrl.com)
+
* Tue May 10 2011 Jan Pazdziora 5.10.5-1
- remove unused import, fix indentation and a minor typo (iartarisi(a)suse.cz)
- fix usage documentation messages for topdir and dest-file (iartarisi(a)suse.cz)
diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg
index f6cfede..d3ac0e1 100644
--- a/rel-eng/packages/rhncfg
+++ b/rel-eng/packages/rhncfg
@@ -1 +1 @@
-5.10.5-1 client/tools/rhncfg/
+5.10.6-1 client/tools/rhncfg/
12 years
Changes to 'refs/tags/rhn-client-tools-1.5.9-1'
by Jan Pazdziora
Tag 'rhn-client-tools-1.5.9-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-31 14:02 +0000
Tagging package [rhn-client-tools] version [1.5.9-1] in directory [client/rhel/rhn-client-tools/].
Changes since spacewalk-web-1.5.14-1:
Jan Pazdziora (1):
Automatic commit of package [rhn-client-tools] release [1.5.9-1].
Matteo Sessa (1):
Fix python import
Miroslav Suchý (1):
fix typo
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++++-
client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py | 2 +-
client/tools/rhncfg/actions/configfiles.py | 1 +
rel-eng/packages/rhn-client-tools | 2 +-
4 files changed, 7 insertions(+), 3 deletions(-)
---
12 years
client/rhel rel-eng/packages
by Jan Pazdziora
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++++-
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit ba52bf9dc2f1390a04f4303cf30a75bf8b9f11e0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue May 31 16:02:37 2011 +0200
Automatic commit of package [rhn-client-tools] release [1.5.9-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 2da946f..8c2d515 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 1.5.8
+Version: 1.5.9
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -341,6 +341,9 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Tue May 31 2011 Jan Pazdziora 1.5.9-1
+- fix typo (msuchy(a)redhat.com)
+
* Mon May 23 2011 Miroslav Suchý 1.5.8-1
- 683200 - u'foo'.decode('utf-8') does not work, while unicode(u'foo') works
and is idempotent (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index a5889a3..86f7775 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.5.8-1 client/rhel/rhn-client-tools/
+1.5.9-1 client/rhel/rhn-client-tools/
12 years
client/tools
by Jan Pazdziora
client/tools/rhncfg/actions/configfiles.py | 1 +
1 file changed, 1 insertion(+)
New commits:
commit d1ed312c702500d09dca07b1dedfe2d2522c6320
Author: Matteo Sessa <matteo.sessa(a)dbmsrl.com>
Date: Tue May 31 13:20:22 2011 +0200
Fix python import
diff --git a/client/tools/rhncfg/actions/configfiles.py b/client/tools/rhncfg/actions/configfiles.py
index 5ec4ac4..76671ab 100755
--- a/client/tools/rhncfg/actions/configfiles.py
+++ b/client/tools/rhncfg/actions/configfiles.py
@@ -15,6 +15,7 @@
import os
import time
+import sys
from config_common import local_config, file_utils, utils, cfg_exceptions
from config_common.rhn_log import set_debug_level, get_debug_level, set_logfile, log_to_file
12 years
client/rhel
by Miroslav Suchý
client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9cd999626558d033c0fec764391eb55f27a97b0b
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 30 14:07:42 2011 +0200
fix typo
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
index 444e281..41091ad 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
@@ -871,7 +871,7 @@ class CreateProfilePage:
if conf_changed:
reviewLog.yum_plugin_conf_changed()
except IOError, e:
- errorWindow(_("Could not open /etc/yum/pluginconf.d/rhnplugin.conf\nyum-rhn-plugin is not enable.\n") + e.errmsg)
+ errorWindow(_("Could not open /etc/yum/pluginconf.d/rhnplugin.conf\nyum-rhn-plugin is not enabled.\n") + e.errmsg)
reviewLog.yum_plugin_conf_error()
rhnreg.spawnRhnCheckForUI()
pwin.setProgress(6,6)
12 years
Changes to 'refs/tags/spacewalk-web-1.5.14-1'
by Michael Mraka
Tag 'spacewalk-web-1.5.14-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-05-30 10:07 +0000
Tagging package [spacewalk-web] version [1.5.14-1] in directory [web/].
Changes since spacewalk-java-1.5.41-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-web] release [1.5.14-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
---
12 years
Changes to 'refs/tags/spacewalk-java-1.5.41-1'
by Michael Mraka
Tag 'spacewalk-java-1.5.41-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-05-30 10:07 +0000
Tagging package [spacewalk-java] version [1.5.41-1] in directory [java/].
Changes since spacewalk-java-1.5.40-1:
Jan Blazek (2):
Add comps-spacewalk-server-fedora15.xml
Add comps-spacewalk-client-fedora15.xml
Julian Einwag (1):
made some queries PG compatible: - replaced (+) with ANSI left join - changed TO_DATE(NULL) to TO_DATE(NULL,NULL) - changed TO_NUMBER(NULL) to TO_NUMBER(NULL,NULL) - replaced DECODE with CASE
Michael Mraka (2):
fixing ISE in errata cloning
Automatic commit of package [spacewalk-java] release [1.5.41-1].
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml | 10
java/code/src/com/redhat/rhn/common/db/datasource/xml/CustomInfo_queries.xml | 12
java/code/src/com/redhat/rhn/common/db/datasource/xml/Monitoring_queries.xml | 49 +--
java/code/src/com/redhat/rhn/common/db/datasource/xml/SystemGroup_queries.xml | 11
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 8
java/spacewalk-java.spec | 5
rel-eng/comps/comps-spacewalk-client-fedora15.xml | 36 ++
rel-eng/comps/comps-spacewalk-server-fedora15.xml | 163 ++++++++++
rel-eng/packages/spacewalk-java | 2
web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml | 22 -
web/modules/rhn/RHN/DB/ErrataEditor.pm | 2
11 files changed, 269 insertions(+), 51 deletions(-)
---
12 years
2 commits - java/spacewalk-java.spec rel-eng/packages web/spacewalk-web.spec
by Michael Mraka
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 6 +++++-
4 files changed, 11 insertions(+), 4 deletions(-)
New commits:
commit 62b94102836ea7d38ac780035092ed1e1ede0f78
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon May 30 12:07:37 2011 +0200
Automatic commit of package [spacewalk-web] release [1.5.14-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 8b0b19a..3a85f2c 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.5.13-1 web/
+1.5.14-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 8c8a669..d100b48 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.13
+Version: 1.5.14
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -257,6 +257,10 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Mon May 30 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.14-1
+- made some queries PG compatible
+- fixing ISE in errata cloning
+
* Tue May 24 2011 Jan Pazdziora 1.5.13-1
- replaced (+) with ANSI left join (je(a)rockenstein.de)
commit 193e791fa0007ad92dbd730bc4af34406756f0db
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon May 30 12:07:16 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.41-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 8b3c42a..7513c1d 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.5.40
+Version: 1.5.41
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -546,6 +546,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon May 30 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.41-1
+- made some queries PG compatible
+
* Fri May 27 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.40-1
- 443126 - introduce notifications for custom errata (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 2fec23b..5c37d11 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.40-1 java/
+1.5.41-1 java/
12 years
java/code web/modules
by Michael Mraka
java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml | 10 +-
java/code/src/com/redhat/rhn/common/db/datasource/xml/CustomInfo_queries.xml | 12 +-
java/code/src/com/redhat/rhn/common/db/datasource/xml/Monitoring_queries.xml | 49 ++++++----
java/code/src/com/redhat/rhn/common/db/datasource/xml/SystemGroup_queries.xml | 11 +-
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 8 -
web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml | 22 ++--
6 files changed, 64 insertions(+), 48 deletions(-)
New commits:
commit 9103a4c0b5f7a715d37ddab1e7d7961d09edbb04
Author: Julian Einwag <je(a)rockenstein.de>
Date: Tue May 24 10:35:59 2011 +0200
made some queries PG compatible: - replaced (+) with ANSI left join - changed TO_DATE(NULL) to TO_DATE(NULL,NULL) - changed TO_NUMBER(NULL) to TO_NUMBER(NULL,NULL) - replaced DECODE with CASE
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml
index be03a6d..43ac7b6 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Action_queries.xml
@@ -13,8 +13,8 @@ SELECT EVENT_ID as ID,
DETAILS
FROM (SELECT SH.id EVENT_ID,
SH.summary SUMMARY,
- TO_DATE(NULL) AS created,
- TO_DATE(NULL) AS picked_up,
+ TO_DATE(NULL,NULL) AS created,
+ TO_DATE(NULL,NULL) AS picked_up,
SH.created as completed, -- view this as the "completed" date for sorting reasons
NULL AS history_status,
NULL AS history_type,
@@ -34,14 +34,14 @@ SELECT EVENT_ID as ID,
NULL AS details
FROM rhnActionType AType,
rhnActionStatus AStat,
- rhnUser U,
- rhnAction A,
+ rhnAction A
+ LEFT JOIN rhnUser U
+ ON A.scheduler = U.id,
rhnServerAction SA
WHERE SA.server_id = :sid
AND SA.action_id = A.id
AND ATYPE.id = A.action_type
AND AStat.id = SA.status
- AND U.id(+) = A.scheduler
AND AStat.id IN (1, 2, 3)
) X
ORDER BY COMPLETED DESC, PICKED_UP DESC, CREATED DESC, EVENT_ID DESC
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/CustomInfo_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/CustomInfo_queries.xml
index 3fd7d79..ec7d34c 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/CustomInfo_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/CustomInfo_queries.xml
@@ -7,10 +7,10 @@ SELECT CDK.id,
CDK.description,
(
SELECT COUNT(SCDV.server_id)
- FROM rhnServerCustomDataValue SCDV,
- rhnUserServerPerms USP
+ FROM rhnUserServerPerms USP
+ LEFT JOIN rhnServerCustomDataValue SCDV
+ ON USP.server_id = SCDV.server_id
WHERE USP.user_id = :user_id
- AND USP.server_id = SCDV.server_id (+)
AND SCDV.key_id = CDK.id
) as system_count,
TO_CHAR(CDK.modified, 'YYYY-MM-DD HH24:MI:SS') AS LAST_MODIFIED
@@ -28,10 +28,10 @@ SELECT CDK.id,
CDK.description,
COUNT(SCDV.key_id) as system_count,
TO_CHAR(CDK.modified, 'YYYY-MM-DD HH24:MI:SS') AS LAST_MODIFIED
- FROM rhnServerCustomDataValue SCDV,
- rhnCustomDataKey CDK
+ FROM rhnCustomDataKey CDK
+ LEFT JOIN rhnServerCustomDataValue SCDV
+ ON CDK.id = SCDV.key_id
WHERE CDK.org_id = :org_id
- AND CDK.id = SCDV.key_id (+)
AND NOT EXISTS (
SELECT 1 FROM rhnServerCustomDataValue
WHERE server_id = :sid
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Monitoring_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Monitoring_queries.xml
index 8ccae6a..92fa36f 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Monitoring_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Monitoring_queries.xml
@@ -124,21 +124,22 @@ WHERE customer_id = :org_id
<mode name="methods_in_org" class="com.redhat.rhn.frontend.dto.monitoring.MethodDto">
<query params="org_id">
<![CDATA[
-SELECT WC.id user_id,
- WC.login login,
- CM.recid recid,
- CM.method_name method_name,
- DECODE( MT.method_type_name,
- 'Email', CM.email_address,
- 'Pager', CM.pager_email,
- 'SNMP', CM.snmp_host) method_target,
+SELECT WC.id AS user_id,
+ WC.login AS login,
+ CM.recid AS recid,
+ CM.method_name AS method_name,
+ (CASE MT.method_type_name
+ WHEN 'Email' THEN CM.email_address
+ WHEN 'Pager' THEN CM.pager_email
+ WHEN 'SNMP' THEN CM.snmp_host
+ END) AS method_target,
MT.method_type_name method_type
- FROM rhn_contact_methods CM,
- web_contact WC,
- rhn_method_types MT
+ FROM rhn_contact_methods CM
+ LEFT JOIN rhn_method_types MT
+ ON CM.method_type_id = MT.recid,
+ web_contact WC
WHERE WC.org_id = :org_id
AND CM.contact_id = WC.id
- AND CM.method_type_id = MT.recid (+)
ORDER BY WC.login, CM.method_name
]]>
</query>
@@ -147,13 +148,23 @@ ORDER BY WC.login, CM.method_name
<mode name="servers_in_suite" class="com.redhat.rhn.frontend.dto.monitoring.MonitoredServerDto">
<query params="suite_id"><![CDATA[
SELECT distinct s.id, s.name,
-( SELECT DECODE(
- MAX(DECODE(statps.state, 'OK', 1, 'PENDING', 2, 'UNKNOWN', 3, 'WARNING', 4, 'CRITICAL', 5)),
- 1, 'OK', 2, 'PENDING', 3, 'UNKNOWN', 4, 'WARNING', 5, 'CRITICAL') ST
- FROM rhn_check_probe statcp, rhn_probe_state statps
- WHERE statcp.probe_id = statps.probe_id
- AND s.id = statcp.host_id(+)
- GROUP BY s.id ) status
+( SELECT (CASE
+ MAX(CASE statps.state
+ WHEN 'OK' THEN 1
+ WHEN 'PENDING' THEN 2
+ WHEN 'UNKNOWN' THEN 3
+ WHEN 'WARNING' THEN 4
+ WHEN 'CRITICAL' THEN 5 END)
+ WHEN 1 THEN 'OK'
+ WHEN 2 THEN 'PENDING'
+ WHEN 3 THEN 'UNKNOWN'
+ WHEN 4 THEN 'WARNING'
+ WHEN 5 THEN 'CRITICAL' END ) ST
+ FROM rhn_check_probe statcp
+ LEFT JOIN rhn_probe_state statps
+ ON s.id = statcp.host_id
+ WHERE statcp.probe_id = statps.probe_id
+ GROUP BY s.id ) status
FROM rhn_check_suites cs,
rhn_check_suite_probe csp,
rhn_service_probe_origins spo,
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/SystemGroup_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/SystemGroup_queries.xml
index 8964eec..bbe1f20 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/SystemGroup_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/SystemGroup_queries.xml
@@ -101,17 +101,18 @@ ORDER BY UPPER(NAME)
<mode name="visible_to_system">
<query params="sid, org_id, user_id">
- SELECT MAX(DECODE(VSGM.server_id, :sid, 1, 0)) is_system_member,
+ SELECT MAX(CASE VSGM.server_id WHEN :sid THEN 1 ELSE 0 END) is_system_member,
VSGM.GROUP_ID id,
VSGM.GROUP_NAME,
VSGM.GROUP_TYPE,
VSGM.CURRENT_MEMBERS,
VSGM.MAX_MEMBERS,
- DECODE(USGP.server_group_id,VSGM.group_id,1,0) AS USER_PERMITTED_ACCESS
- FROM rhnVisServerGroupMembership VSGM, rhnUserServerGroupPerms USGP
+ (CASE USGP.server_group_id WHEN VSGM.group_id THEN 1 ELSE 0 END) AS USER_PERMITTED_ACCESS
+ FROM rhnVisServerGroupMembership VSGM
+ LEFT JOIN rhnUserServerGroupPerms USGP
+ ON VSGM.group_id = USGP.server_group_id
+ AND :user_id = USGP.user_id
WHERE VSGM.ORG_ID = :org_id
- AND :user_id = USGP.user_id (+)
- AND VSGM.group_id = USGP.server_group_id (+)
GROUP BY VSGM.group_id, VSGM.group_name, VSGM.group_type, VSGM.current_members, VSGM.max_members, USGP.server_group_id
ORDER BY UPPER(VSGM.group_name), VSGM.group_id
</query>
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
index 3ab72a2..0b7bf98 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
@@ -501,15 +501,14 @@ ORDER BY UPPER(COALESCE(X.server_name, '(none)')), X.id
select a.server_id id,
s.name server_name,
COALESCE(sg.name,'Org Admin access') group_name
-from rhnServerGroup sg,
- rhnServer s,
+from rhnServer s,
(
select usg.user_id, sgm.server_id, sgm.server_group_id
from rhnServerGroupMembers sgm,
rhnUserServerGroupPerms usg
where usg.server_group_id = sgm.server_group_id
union all
- select ugm.user_id, s.id server_id, TO_NUMBER(null) server_group_id
+ select ugm.user_id, s.id server_id, TO_NUMBER(null,null) server_group_id
from rhnUserGroup ug,
rhnUserGroupMembers ugm,
rhnServer s,
@@ -522,9 +521,10 @@ from rhnServerGroup sg,
where label = 'org_admin')
and s.org_id = u.org_id
) a
+left join rhnServerGroup sg
+on a.server_group_id = sg.id
where a.user_id = :formvar_uid
and a.server_id in (%s)
- and a.server_group_id = sg.id(+)
and a.server_id = s.id
</elaborator>
</mode>
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 f9715da..5b8cfb0 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
@@ -458,15 +458,14 @@ ORDER BY UPPER(NVL(S.name, '(none)')), S.id
select a.server_id id,
s.name server_name,
NVL(sg.name,'Org Admin access') group_name
-from rhnServerGroup sg,
- rhnServer s,
+from rhnServer s,
(
select usg.user_id, sgm.server_id, sgm.server_group_id
from rhnServerGroupMembers sgm,
rhnUserServerGroupPerms usg
where usg.server_group_id = sgm.server_group_id
union all
- select ugm.user_id, s.id server_id, TO_NUMBER(null) server_group_id
+ select ugm.user_id, s.id server_id, TO_NUMBER(null,null) server_group_id
from rhnUserGroup ug,
rhnUserGroupMembers ugm,
rhnServer s,
@@ -479,9 +478,10 @@ from rhnServerGroup sg,
where label = 'org_admin')
and s.org_id = u.org_id
) a
+left join rhnServerGroup sg
+on a.server_group_id = sg.id
where a.user_id = :some_user_id
and a.server_id in (%s)
- and a.server_group_id = sg.id(+)
and a.server_id = s.id
</elaborator>
<elaborator name="system_overview" />
@@ -1060,18 +1060,22 @@ SELECT DISTINCT ST.element AS ID
</mode>
<query name="available_to_user" params="user_id">
+select * from (
SELECT DISTINCT S.id,
S.name,
SI.server_id AS IS_RHN_SATELLITE,
PI.server_id AS IS_RHN_PROXY,
TO_CHAR(Sinfo.checkin, 'YYYY-MM-DD HH24:MI:SS') AS LAST_CHECKIN
- FROM rhnSatelliteInfo SI, rhnServerInfo SInfo, rhnProxyInfo PI, rhnServer S, rhnUserServerPerms USP
+ FROM rhnServer S
+ LEFT JOIN rhnSatelliteInfo SI
+ ON S.id = SI.server_id
+ LEFT JOIN rhnProxyInfo PI
+ ON S.id = PI.server_id,
+ rhnServerInfo SInfo, rhnUserServerPerms USP
WHERE USP.user_id = :user_id
AND S.id = USP.server_id
- AND S.id = SI.server_id (+)
- AND S.id = PI.server_id (+)
- AND Sinfo.server_id = S.id
-ORDER BY UPPER(NVL(S.name, '(none)')), S.id
+ AND Sinfo.server_id = S.id ) X
+ORDER BY UPPER(NVL(X.name, '(none)')), X.id
</query>
12 years