schema/spacewalk/oracle/packages/packages.deps | 1
schema/spacewalk/postgres/packages/packages.deps | 1
web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml | 27 ------------
web/modules/sniglets/Sniglets/ListView/GeneralList.pm | 23 ----------
web/modules/sniglets/Sniglets/Org.pm | 31 --------------
5 files changed, 83 deletions(-)
New commits:
commit 4a6f63f103cbe71d4cf2f90fb92e4550f59ab100
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 16:55:57 2009 +0100
Previous removal made use RHN::Kickstart::IPRange obsolete, removing.
diff --git a/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
b/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
index 4d97bd2..e5702b9 100644
--- a/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
@@ -23,7 +23,6 @@ use RHN::DataSource::Simple;
use RHN::Exception qw/throw/;
use RHN::Token;
use RHN::Kickstart;
-use RHN::Kickstart::IPRange;
use RHN::Kickstart::Session;
use RHN::Utils;
commit df9577f02d6f8ca28d2eeb925fede3feca939abb
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 16:54:45 2009 +0100
rhn-listview mode ip_ranges_for_org not used, making ip_ranges_provider and query
ip_ranges_for_org obsolete as well, removing.
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
b/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
index 4be8867..d002b5c 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
@@ -289,18 +289,6 @@ SELECT KSS.id, S.name AS system_name
</elaborator>
</mode>
-<mode name="ip_ranges_for_org">
- <query params="org_id">
- SELECT IPR.org_id || IPR.min || IPR.max AS ID,
- IPR.org_id, IPR.min, IPR.max,
- KS.id AS kickstart_id, KS.label
- FROM rhnKickstartIPRange IPR, rhnKSData KS
- WHERE IPR.org_id = :org_id
- AND KS.id = IPR.kickstart_id
-ORDER BY IPR.min
- </query>
-</mode>
-
<mode name="kickstart_session_history">
<query params="kssid">
SELECT KSH.id,
diff --git a/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
b/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
index 209f343..4d97bd2 100644
--- a/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
@@ -105,10 +105,6 @@ sub _register_modes {
-datasource => RHN::DataSource::General->new,
-provider => \&kickstart_sessions_provider);
- Sniglets::ListView::List->add_mode(-mode => "ip_ranges_for_org",
- -datasource => RHN::DataSource::General->new,
- -provider => \&ip_ranges_provider);
-
Sniglets::ListView::List->add_mode(-mode =>
"kickstart_session_history",
-datasource => RHN::DataSource::General->new,
-provider => \&session_history_provider);
@@ -231,21 +227,6 @@ sub kickstart_sessions_provider {
return (%ret);
}
-sub ip_ranges_provider {
- my $self = shift;
- my $pxt = shift;
-
- my %ret = $self->default_provider($pxt);
-
- foreach my $row (@{$ret{data}}) {
- my $range = new RHN::Kickstart::IPRange(-min => $row->{MIN}, -max =>
$row->{MAX});
-
- $row->{RANGE} = sprintf('<tt>%s - %s</tt>',
$range->min, $range->max);
- }
-
- return (%ret);
-}
-
sub session_history_provider {
my $self = shift;
my $pxt = shift;
commit a25b1a89c5f2e8d1e89742ece271bb58871d3bcb
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 16:53:24 2009 +0100
rhn-listview mode private_kstrees_for_user not used, making query
private_kstrees_for_user obsolete as well, removing.
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
b/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
index c948356..4be8867 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
@@ -252,21 +252,6 @@ ORDER BY KTT.id, KT.label
</query>
</mode>
-<mode name="private_kstrees_for_user">
- <query params="user_id">
-SELECT KT.id, KT.base_path, KT.channel_id, KT.label, KT.boot_image,
- UAC.channel_name, UAC.channel_label,
- KTT.label AS KSTREE_TYPE_LABEL, KTT.name AS KSTREE_TYPE_NAME
- FROM rhnKSTreeType KTT, rhnKickstartableTree KT, web_contact wc,
rhnUserAvailableChannels UAC
- WHERE UAC.user_id = :user_id
- AND wc.id = :user_id
- AND KT.channel_id = UAC.channel_id
- AND KTT.id = KT.kstree_type
- AND KT.org_id = wc.org_id
-ORDER BY KTT.id, KT.label
- </query>
-</mode>
-
<mode name="kickstart_sessions_for_org">
<query params="org_id, days">
SELECT KSS.id,
diff --git a/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
b/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
index f074061..209f343 100644
--- a/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
@@ -109,9 +109,6 @@ sub _register_modes {
-datasource => RHN::DataSource::General->new,
-provider => \&ip_ranges_provider);
- Sniglets::ListView::List->add_mode(-mode =>
"private_kstrees_for_user",
- -datasource => RHN::DataSource::General->new);
-
Sniglets::ListView::List->add_mode(-mode =>
"kickstart_session_history",
-datasource => RHN::DataSource::General->new,
-provider => \&session_history_provider);
commit b13c8ca1020618cf3958790e66135a8085696089
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 16:48:50 2009 +0100
rhn_external_api does not seem to exist, removing dead deps.
diff --git a/schema/spacewalk/oracle/packages/packages.deps
b/schema/spacewalk/oracle/packages/packages.deps
index 9c36e7b..a074659 100644
--- a/schema/spacewalk/oracle/packages/packages.deps
+++ b/schema/spacewalk/oracle/packages/packages.deps
@@ -49,7 +49,6 @@ rhn_entitlements.pkb :: rhnServerGroupType rhnServerGroup
rhnServerGroupMembe
rhn_entitlements.pks :: rhnServerGroupType
rhn_exception.pkb :: rhnException
rhn_exception.pks :: rhnException
-rhn_external_api.pkb :: web_contact xxrh_eproxy_api
rhn_ep.pkb :: rhn_bel.pks rhn_channel.pks rhn_entitlements.pks
rhn_exception.pks \
rhn_quota web_contact web_customer \
web_user_order web_user_order_line \
diff --git a/schema/spacewalk/postgres/packages/packages.deps
b/schema/spacewalk/postgres/packages/packages.deps
index 071eae6..1ca1a4d 100644
--- a/schema/spacewalk/postgres/packages/packages.deps
+++ b/schema/spacewalk/postgres/packages/packages.deps
@@ -48,7 +48,6 @@ rhn_entitlements.pkb :: rhnServerGroupType rhnServerGroup
rhnServerGroupMembe
rhn_entitlements.pks :: rhnServerGroupType
rhn_exception.pkb :: rhnException
rhn_exception.pks :: rhnException
-rhn_external_api.pkb :: web_contact xxrh_eproxy_api
rhn_ep.pkb :: rhn_bel.pks rhn_channel.pks rhn_entitlements.pks
rhn_exception.pks \
rhn_quota web_contact web_customer \
web_user_order web_user_order_line \
commit 2dedb37117990d457f973c9f3b9fc8674aed1367
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 16:44:27 2009 +0100
Removal of cert_info made render_channel_rows obsolete, removing.
diff --git a/web/modules/sniglets/Sniglets/Org.pm b/web/modules/sniglets/Sniglets/Org.pm
index 6b9b8da..1570c78 100644
--- a/web/modules/sniglets/Sniglets/Org.pm
+++ b/web/modules/sniglets/Sniglets/Org.pm
@@ -107,37 +107,6 @@ sub get_service_map {
}
-sub render_channel_rows {
- my $channels = shift;
- my $prefix = shift;
- my $render_zero_quant = shift;
- my $counter = 1;
- my $ret = "";
-
- foreach my $label (sort keys %{$channels}) {
- $counter++;
- my $row_class = ($counter % 2) ? "list-row-even" :
"list-row-odd";
- my $quant = $channels->{$label}->{QUANT};
- my $id = $channels->{$label}->{ID};
- if ($render_zero_quant or $quant > 0) {
- $ret .= "<tr class=\"" . $row_class .
"\"><td>" . $label . "</td><td
align=\"center\">" . $quant . "</td><td
align=\"center\">";
- if ($label eq 'rhn-tools') {
- $ret .= "$quant\n";
- $ret .= "<input type=\"hidden\" name=\"" . $prefix .
"_" . $id . "_quant\" value=\"" . $quant .
"\"/>\n";
- }
- else {
- $ret .= "<input size=\"5\" type=\"text\"
name=\"" . $prefix . "_" . $id . "_quant\"
value=\"" . $quant . "\"/>\n";
- }
- $ret .= "<input type=\"hidden\" name=\"" . $prefix .
"\" value=\"$id\"/>";
- $ret .= "<input type=\"hidden\" name=\"" . $prefix .
"_" . $id . "_label\" value=\"" . $label .
"\"/>\n";
- $ret .= "<input type=\"hidden\" name=\"" . $prefix .
"_" . $id . "_oldquant\" value=\"" . $quant .
"\"/>\n";
- $ret .= "</td></tr>\n";
- }
- }
-
- return $ret;
-}
-
# render the page that lets user view cert data
sub cert_text {
my $pxt = shift;