Changes to 'refs/tags/spacewalk-web-1.8.34-1'
by StephenHerr
Tag 'spacewalk-web-1.8.34-1' created by Stephen Herr <sherr(a)redhat.com> at 2012-09-05 15:07 +0000
Tagging package [spacewalk-web] version [1.8.34-1] in directory [web/].
Changes since spacewalk-java-1.8.140-1:
Jan Pazdziora (5):
Format the timestamps as well.
Make the into variable match the data type of the table column.
854686 - Fixing the rhn_command.command_class default.
849018 - extending rhnPackageCapability.version.
849018 - schema upgrade scripts for extending rhnPackageCapability.version.
Stephen Herr (2):
815964 - moving monitoring probe batch option from rhn.conf to rhn_web.conf
Automatic commit of package [spacewalk-web] release [1.8.34-1].
---
backend/rhn-conf/rhn.conf | 2 -
backend/server/rhn.conf.sample | 2 -
java/code/src/com/redhat/rhn/common/conf/test/conf/default/rhn_web.conf | 1
rel-eng/packages/spacewalk-web | 2 -
schema/spacewalk/common/tables/rhnPackageCapability.sql | 4 +-
schema/spacewalk/postgres/packages/rhn_channel.pkb | 2 -
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/125-rhn_channel-obtain_read_lock.pkb.sql.oracle | 1
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/125-rhn_channel-obtain_read_lock.pkb.sql.postgresql | 18 ++++++++++
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/126-rhn_command-command_class-default.sql.oracle | 4 ++
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/126-rhn_command-command_class-default.sql.postgresql | 5 ++
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/127-rhnPackageCapability-version.sql.oracle | 3 +
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/127-rhnPackageCapability-version.sql.postgresql | 4 ++
utils/spacewalk-dump-schema | 5 ++
web/conf/rhn_web.conf | 4 ++
web/spacewalk-web.spec | 5 ++
15 files changed, 52 insertions(+), 10 deletions(-)
---
11 years, 8 months
2 commits - backend/rhn-conf backend/server java/code rel-eng/packages web/conf web/spacewalk-web.spec
by StephenHerr
backend/rhn-conf/rhn.conf | 2 --
backend/server/rhn.conf.sample | 2 --
java/code/src/com/redhat/rhn/common/conf/test/conf/default/rhn_web.conf | 1 +
rel-eng/packages/spacewalk-web | 2 +-
web/conf/rhn_web.conf | 4 ++++
web/spacewalk-web.spec | 5 ++++-
6 files changed, 10 insertions(+), 6 deletions(-)
New commits:
commit 6444d572117d36b3ec8c3d36362b335e59512e87
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Sep 5 11:07:59 2012 -0400
Automatic commit of package [spacewalk-web] release [1.8.34-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 7944e4e..192483b 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.8.33-1 web/
+1.8.34-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 159ecc2..23fca41 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.8.33
+Version: 1.8.34
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -253,6 +253,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Wed Sep 05 2012 Stephen Herr <sherr(a)redhat.com> 1.8.34-1
+- 815964 - moving monitoring probe batch option from rhn.conf to rhn_web.conf
+
* Fri Aug 31 2012 Jan Pazdziora 1.8.33-1
- 852048 - fix typo in db-control man page
commit b7b676e05053795e7c8202bd7484a51cc49781c6
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Sep 5 11:07:07 2012 -0400
815964 - moving monitoring probe batch option from rhn.conf to rhn_web.conf
diff --git a/backend/rhn-conf/rhn.conf b/backend/rhn-conf/rhn.conf
index 969486c..a257157 100644
--- a/backend/rhn-conf/rhn.conf
+++ b/backend/rhn-conf/rhn.conf
@@ -13,5 +13,3 @@ log_file = /var/log/rhn/rhn.log
enable_snapshots = 1
-web.monitoring_probes_batch_size = 50
-
diff --git a/backend/server/rhn.conf.sample b/backend/server/rhn.conf.sample
index 4fd075e..eb30b65 100644
--- a/backend/server/rhn.conf.sample
+++ b/backend/server/rhn.conf.sample
@@ -81,8 +81,6 @@ web.mail_server_errors = user0(a)redhat.com, user1(a)redhat.com
web.rhnproc_server = #FIXME
web.rhnproc_port = #FIXME
-#web.monitoring_probes_batch_size = 50
-
### COMPONENT DEFINITIONS ###
diff --git a/java/code/src/com/redhat/rhn/common/conf/test/conf/default/rhn_web.conf b/java/code/src/com/redhat/rhn/common/conf/test/conf/default/rhn_web.conf
index 9f58b5c..2d1a57c 100644
--- a/java/code/src/com/redhat/rhn/common/conf/test/conf/default/rhn_web.conf
+++ b/java/code/src/com/redhat/rhn/common/conf/test/conf/default/rhn_web.conf
@@ -9,3 +9,4 @@ web.property_with_comment = 42 #This shouldn't be part of the value
web.product_name=Spacewalk
web.taskomatic_cobbler_user = taskomatic_user
+web.monitoring_probes_batch_size = 50
diff --git a/web/conf/rhn_web.conf b/web/conf/rhn_web.conf
index 0be7ee9..3a3dcbd 100644
--- a/web/conf/rhn_web.conf
+++ b/web/conf/rhn_web.conf
@@ -243,6 +243,10 @@ web.is_monitoring_backend = 0
# should this system run the monitoring scout code?
web.is_monitoring_scout = 0
+# how many monitoring probes to update at once. Large batches (eg. thousands)
+# can lead to database deadlocks.
+web.monitoring_probes_batch_size = 50
+
# server configs needed for satellite installer
server.satellite.rhn_parent =
server.satellite.http_proxy =
11 years, 8 months
schema/spacewalk
by Jan Pazdziora
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/127-rhnPackageCapability-version.sql.oracle | 3 +++
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/127-rhnPackageCapability-version.sql.postgresql | 4 ++++
2 files changed, 7 insertions(+)
New commits:
commit af4a153419204be2fcde71bbbed0d7289d723403
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Sep 5 16:55:33 2012 +0200
849018 - schema upgrade scripts for extending rhnPackageCapability.version.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/127-rhnPackageCapability-version.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/127-rhnPackageCapability-version.sql.oracle
new file mode 100644
index 0000000..dc5569b
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/127-rhnPackageCapability-version.sql.oracle
@@ -0,0 +1,3 @@
+
+alter table rhnPackageCapability modify version varchar2(512) ;
+
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/127-rhnPackageCapability-version.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/127-rhnPackageCapability-version.sql.postgresql
new file mode 100644
index 0000000..d54cbb7
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/127-rhnPackageCapability-version.sql.postgresql
@@ -0,0 +1,4 @@
+-- oracle equivalent source sha1 2ec08603934e79457fb7fe1a0a6075f4331363ba
+
+alter table rhnPackageCapability alter version type varchar(512) ;
+
11 years, 8 months
schema/spacewalk
by Jan Pazdziora
schema/spacewalk/common/tables/rhnPackageCapability.sql | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f89a70e86fa7344c1b0cc323a8f8173c99051800
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Sep 5 16:54:29 2012 +0200
849018 - extending rhnPackageCapability.version.
diff --git a/schema/spacewalk/common/tables/rhnPackageCapability.sql b/schema/spacewalk/common/tables/rhnPackageCapability.sql
index f947dfb..50ff246 100644
--- a/schema/spacewalk/common/tables/rhnPackageCapability.sql
+++ b/schema/spacewalk/common/tables/rhnPackageCapability.sql
@@ -1,5 +1,5 @@
--
--- Copyright (c) 2008 Red Hat, Inc.
+-- Copyright (c) 2008--2012 Red Hat, Inc.
--
-- This software is licensed to you under the GNU General Public License,
-- version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -20,7 +20,7 @@ CREATE TABLE rhnPackageCapability
CONSTRAINT rhn_pkg_capability_id_pk PRIMARY KEY
USING INDEX TABLESPACE [[4m_tbs]],
name VARCHAR2(4000) NOT NULL,
- version VARCHAR2(64),
+ version VARCHAR2(512),
created DATE
DEFAULT (sysdate) NOT NULL,
modified DATE
11 years, 8 months
schema/spacewalk
by Jan Pazdziora
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/126-rhn_command-command_class-default.sql.oracle | 4 ++++
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/126-rhn_command-command_class-default.sql.postgresql | 5 +++++
2 files changed, 9 insertions(+)
New commits:
commit 46ff247497a6b0a13498c8df6f4c9bb80167ff33
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Sep 5 16:01:16 2012 +0200
854686 - Fixing the rhn_command.command_class default.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/126-rhn_command-command_class-default.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/126-rhn_command-command_class-default.sql.oracle
new file mode 100644
index 0000000..eeb8bcc
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/126-rhn_command-command_class-default.sql.oracle
@@ -0,0 +1,4 @@
+
+alter table rhn_command
+modify command_class default '/var/lib/nocpulse/libexec/plugin';
+
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/126-rhn_command-command_class-default.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/126-rhn_command-command_class-default.sql.postgresql
new file mode 100644
index 0000000..7c3423b
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/126-rhn_command-command_class-default.sql.postgresql
@@ -0,0 +1,5 @@
+-- oracle equivalent source sha1 e0d900ecb474aad2f3f05f2daf3b5e8a60836ec8
+
+alter table rhn_command
+alter command_class set default '/var/lib/nocpulse/libexec/plugin';
+
11 years, 8 months
schema/spacewalk
by Jan Pazdziora
schema/spacewalk/postgres/packages/rhn_channel.pkb | 2 -
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/125-rhn_channel-obtain_read_lock.pkb.sql.oracle | 1
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/125-rhn_channel-obtain_read_lock.pkb.sql.postgresql | 18 ++++++++++
3 files changed, 20 insertions(+), 1 deletion(-)
New commits:
commit 9ff3510a2f3c1420b8a5bbabf9697486acf2cc7f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Sep 5 13:05:51 2012 +0200
Make the into variable match the data type of the table column.
diff --git a/schema/spacewalk/postgres/packages/rhn_channel.pkb b/schema/spacewalk/postgres/packages/rhn_channel.pkb
index e06892a..aa539c1 100644
--- a/schema/spacewalk/postgres/packages/rhn_channel.pkb
+++ b/schema/spacewalk/postgres/packages/rhn_channel.pkb
@@ -25,7 +25,7 @@ update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_
create or replace function obtain_read_lock(channel_family_id_in in numeric, org_id_in in numeric)
returns void as $$
declare
- read_lock date;
+ read_lock timestamptz;
begin
select created into read_lock
from rhnPrivateChannelFamily
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/125-rhn_channel-obtain_read_lock.pkb.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/125-rhn_channel-obtain_read_lock.pkb.sql.oracle
new file mode 100644
index 0000000..b7b00b1
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/125-rhn_channel-obtain_read_lock.pkb.sql.oracle
@@ -0,0 +1 @@
+-- This file is intentionally left empty.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/125-rhn_channel-obtain_read_lock.pkb.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/125-rhn_channel-obtain_read_lock.pkb.sql.postgresql
new file mode 100644
index 0000000..2ae326e
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/125-rhn_channel-obtain_read_lock.pkb.sql.postgresql
@@ -0,0 +1,18 @@
+-- oracle equivalent source sha1 b14267384bc104605623a41b755e68e0103b5aa8
+
+--update pg_setting
+update pg_settings set setting = 'rhn_channel,' || setting where name = 'search_path';
+
+ create or replace function obtain_read_lock(channel_family_id_in in numeric, org_id_in in numeric)
+ returns void as $$
+ declare
+ read_lock timestamptz;
+ begin
+ select created into read_lock
+ from rhnPrivateChannelFamily
+ where channel_family_id = channel_family_id_in and org_id = org_id_in
+ for update;
+ end$$ language plpgsql;
+
+-- restore the original setting
+update pg_settings set setting = overlay( setting placing '' from 1 for (length('rhn_channel')+1) ) where name = 'search_path';
11 years, 8 months
utils/spacewalk-dump-schema
by Jan Pazdziora
utils/spacewalk-dump-schema | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit bb707b0c15b75345e9efe8f56184f213240d7136
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Sep 4 16:13:46 2012 +0200
Format the timestamps as well.
diff --git a/utils/spacewalk-dump-schema b/utils/spacewalk-dump-schema
index c460dc2..8bbb0d7 100755
--- a/utils/spacewalk-dump-schema
+++ b/utils/spacewalk-dump-schema
@@ -38,13 +38,16 @@ if (grep { defined $_ } $db, $user, $password) {
}
$ENV{NLS_LANG} = 'AMERICAN_AMERICA.UTF8';
+$ENV{NLS_DATE_FORMAT} = 'YYYY-MM-DD HH24:MI:SS';
+$ENV{NLS_TIMESTAMP_FORMAT} = 'YYYY-MM-DD HH24:MI:SS';
+$ENV{NLS_TIMESTAMP_TZ_FORMAT} = 'YYYY-MM-DD HH24:MI:SS TZH:TZM';
+
my $dbh = DBI->connect("dbi:Oracle:$options{db_name}", $options{db_user}, $options{db_password}, {
RaiseError => 1,
FetchHashKeyName => 'NAME_lc',
LongReadLen => 10_000_000,
LongTruncOk => 0,
});
-$dbh->do(q!alter session set nls_date_format = 'YYYY-MM-DD HH24:MI:SS'!);
print <<'EOS';
\set ON_ERROR_STOP on
11 years, 8 months
Changes to 'refs/tags/spacewalk-java-1.8.140-1'
by Tomas Lestach
Tag 'spacewalk-java-1.8.140-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-09-04 08:48 +0000
Tagging package [spacewalk-java] version [1.8.140-1] in directory [java/].
Changes since spacewalk-schema-1.8.72-1:
Tomas Lestach (2):
853444 - list only subscribable base channels for actiovation key associations
Automatic commit of package [spacewalk-java] release [1.8.140-1].
---
java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml | 9 +++++++
java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java | 12 ++++++++++
java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDetailsAction.java | 2 -
java/spacewalk-java.spec | 7 +++++
rel-eng/packages/spacewalk-java | 2 -
5 files changed, 29 insertions(+), 3 deletions(-)
---
11 years, 8 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 7 ++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit c22c96d66aceff42a7edea538f1f757b0eeed945
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Sep 4 10:48:46 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.140-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 0169251..8e95812 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.139
+Version: 1.8.140
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -614,6 +614,11 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Sep 04 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.140-1
+- 853444 - list only subscribable base channels for actiovation key
+ associations
+- 839960 - rewrite query for system.listLatestUpgradablePackages API
+
* Fri Aug 31 2012 Jan Pazdziora 1.8.139-1
- Add countries BQ, CW, SX.
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index a971bad..a42cffa 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.139-1 java/
+1.8.140-1 java/
11 years, 8 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml | 9 +++++++
java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java | 12 ++++++++++
java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDetailsAction.java | 2 -
3 files changed, 22 insertions(+), 1 deletion(-)
New commits:
commit 76511a940d5d90337736067b0cc709314eb76879
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Sep 3 17:33:08 2012 +0200
853444 - list only subscribable base channels for actiovation key associations
diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
index e7afcda..7fabf8d 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml
@@ -161,6 +161,15 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
order by C.name]]>
<return alias="c" class="com.redhat.rhn.domain.channel.Channel" />
</sql-query>
+ <sql-query name="Channel.findSubscribableBaseChannels">
+ <![CDATA[SELECT {c.*}
+ FROM rhnUserChannel uc JOIN rhnChannel {c} ON c.id = uc.channel_id
+ LEFT OUTER JOIN rhnChannelCloned c_1_ ON c.id = c_1_.id
+ WHERE uc.user_id = :user_id
+ AND uc.role = 'subscribe'
+ AND c.parent_channel is null]]>
+ <return alias="c" class="com.redhat.rhn.domain.channel.Channel" />
+ </sql-query>
<sql-query name="Channel.findAllBaseChannels">
<![CDATA[SELECT {c.*}
FROM rhnUserChannel uc,
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
index 5982bca..c2d02b6 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java
@@ -937,6 +937,18 @@ public class ChannelFactory extends HibernateFactory {
* @param user logged in user.
* @return list of custom channels
*/
+ public static List<Channel> listSubscribableBaseChannels(User user) {
+ Map params = new HashMap();
+ params.put("user_id", user.getId());
+ return singleton.listObjectsByNamedQuery(
+ "Channel.findSubscribableBaseChannels", params);
+ }
+
+ /**
+ * List all accessible base channels for an org
+ * @param user logged in user.
+ * @return list of custom channels
+ */
public static List<Channel> listAllBaseChannels(User user) {
Map params = new HashMap();
params.put("org_id", user.getOrg().getId());
diff --git a/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDetailsAction.java
index 7ced127..517709d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDetailsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/token/ActivationKeyDetailsAction.java
@@ -279,7 +279,7 @@ public class ActivationKeyDetailsAction extends RhnAction {
List<LabelValueBean> channelWidgets = new LinkedList<LabelValueBean>();
channelWidgets.add(lvl10n("activation-key.jsp.rh-default",
String.valueOf(DEFAULT_CHANNEL_ID)));
- List<Channel> rhChannels = ChannelFactory.listRedHatBaseChannels();
+ List<Channel> rhChannels = ChannelFactory.listSubscribableBaseChannels(user);
for (Channel channel : rhChannels) {
channelWidgets.add(lv(channel.getName(), String.valueOf(channel.getId())));
}
11 years, 8 months