web/modules/sniglets/Sniglets/ListView/GeneralList.pm | 72 ------------------
web/modules/sniglets/Sniglets/Lists.pm | 19 ----
2 files changed, 91 deletions(-)
New commits:
commit 4ca930148161506295451dfd5b87ed0c1bd07700
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 14:28:32 2009 +0100
purchase_history not used, removing, as well as purchase_history_provider.
diff --git a/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
b/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
index 3db80ff..a3e01e4 100644
--- a/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
@@ -90,10 +90,6 @@ sub _register_modes {
-provider => \&activation_key_provider,
-action_callback => \&activation_key_cb);
- Sniglets::ListView::List->add_mode(-mode => "purchase_history",
- -datasource => RHN::DataSource::General->new,
- -provider => \&purchase_history_provider);
-
Sniglets::ListView::List->add_mode(-mode => "faq_list",
-datasource => RHN::DataSource::General->new);
@@ -200,74 +196,6 @@ sub activation_key_provider {
return (%ret);
}
-sub purchase_history_provider {
- my $self = shift;
- my $pxt = shift;
-
- my $ds = $self->datasource;
-
- my $org_id = $pxt->user->org_id;
- if ($pxt->param('support_org_id')) {
- $org_id = $pxt->param('support_org_id');
- }
-
- my $data = $ds->execute_query(-org_id => $org_id);
-
- my $org = $pxt->user->org;
-
- my $all_ids = [ map { $_->{ID} } @{$data} ];
- $self->all_ids($all_ids);
-
- my $summary; #Keep some data for summary
-
- foreach my $type (qw/trial free paid/) {
- $summary->{$type}->{"${_}_slots"} = 0 foreach (qw/enterprise basic
provisioning/);
- }
-
- foreach my $row (@{$data}) {
- my $type = 'trial';
-
- $row->{PAID} ||= 'T';
- if ($row->{PAID} eq 'F') {
- $type = 'free';
- }
- elsif ($row->{PAID} eq 'P') {
- $type = 'paid';
- }
-
- $row->{SLOTS} = $row->{QUANTITY};
-
- $row->{GROUP_LABEL} ||= ''; #prevent warn
-
- if ($row->{GROUP_LABEL} eq 'enterprise_entitled' and $row->{QUANTITY}
>= 0) {
- $row->{SLOTS} .= ' Management';
- $summary->{$type}->{enterprise_slots} += $row->{QUANTITY};
- }
- elsif ($row->{GROUP_LABEL} eq 'provisioning_entitled') {
- if (RHN::Catalog->is_provisioning_upgrade_product($row->{PRODUCT_ITEM_CODE}))
{
- $row->{SLOTS} .= ' Provisioning Upgrade';
- }
- else {
- $row->{SLOTS} .= ' Provisioning';
- }
- $summary->{$type}->{provisioning_slots} += $row->{QUANTITY};
- }
- elsif ($row->{GROUP_LABEL} eq 'sw_mgr_entitled') {
- $row->{SLOTS} .= ' ' . $org->basic_slot_name;
- $summary->{$type}->{basic_slots} += $row->{QUANTITY};
- }
- }
-
- $pxt->pnotes("purchase_history_summary", $summary);
-
-# slice data last because we need the summary info above
- $data = $ds->slice_data($data, $self->lower, $self->upper);
-
- return (data => $data,
- all_ids => $all_ids,
- alphabar => undef);
-}
-
my @allowed_sort_columns = qw/FB.created BASIC_SLOTS ENTERPRISE_SLOTS/;
sub kickstarts_for_org_provider {
commit f0b0bc9d055b81466683d2de824f6fec297940e5
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 11 14:27:55 2009 +0100
rhn-purchase-history-summary not used anywhere, removing, as well as
purchase_history_summary.
diff --git a/web/modules/sniglets/Sniglets/Lists.pm
b/web/modules/sniglets/Sniglets/Lists.pm
index 31f5320..5d357d1 100644
--- a/web/modules/sniglets/Sniglets/Lists.pm
+++ b/web/modules/sniglets/Sniglets/Lists.pm
@@ -51,7 +51,6 @@ sub register_tags {
$pxt->register_tag('rhn-errata-list-summary', \&errata_list_summary,
5);
$pxt->register_tag('rhn-system-group-list-summary',
\&system_group_list_summary, 5);
- $pxt->register_tag('rhn-purchase-history-summary',
\&purchase_history_summary, 5);
$pxt->register_tag('rhn-system-name', \&system_name, -5);
$pxt->register_tag('rhn-time-period-selector', \&time_selector);
@@ -302,24 +301,6 @@ sub system_group_list_summary {
return $html;
}
-sub purchase_history_summary {
- my $pxt = shift;
- my %attr = @_;
-
- my $type = $attr{type} || '';
-
- throw "Not a valid type: '$type'." unless grep { $type eq $_ }
qw/free trial paid/;
-
- my $summary = $pxt->pnotes("purchase_history_summary");
- my $html = '';
-
- if ($summary) {
- $html = PXT::Utils->perform_substitutions($attr{__block__},
$summary->{$type});
- }
-
- return $html;
-}
-
sub system_name {
my $pxt = shift;
my %params = @_;
Show replies by date