web/modules/sniglets/Sniglets/Packages.pm | 6 -
web/modules/sniglets/Sniglets/Servers.pm | 129 ------------------------------
2 files changed, 135 deletions(-)
New commits:
commit f85f99fdf74e254638375fa382a745ed2ed4e963
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 21:18:14 2010 +0100
Removal of package_search_form made search_arch_list unused, removing.
diff --git a/web/modules/sniglets/Sniglets/Packages.pm
b/web/modules/sniglets/Sniglets/Packages.pm
index 126bf64..6304ac9 100644
--- a/web/modules/sniglets/Sniglets/Packages.pm
+++ b/web/modules/sniglets/Sniglets/Packages.pm
@@ -336,12 +336,6 @@ sub package_details {
return PXT::Utils->perform_substitutions($ret, \%subst);
}
-sub search_arch_list {
- my $class = shift;
-
- return ['ia32', 'IA-32'], ['ia64', 'IA-64'],
['x86_64', 'AMD64']
-}
-
sub raw_pkgmap {
my $pxt = shift;
commit ccfb9e6af1786286cd889bae0d3d1f6ed31ab4d8
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 21:13:10 2010 +0100
base_entitlement_box, addon_entitlement_box, and store_bounce not referenced,
removing.
diff --git a/web/modules/sniglets/Sniglets/Servers.pm
b/web/modules/sniglets/Sniglets/Servers.pm
index 3d287a5..0308b0c 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -613,48 +613,6 @@ sub base_entitlement {
}
}
-sub base_entitlement_box {
- my $pxt = shift;
- my $server = shift;
-
- my ($base_entitlement) = grep { $_->{IS_BASE} eq 'Y' }
$server->entitlements;
-
- $base_entitlement ||= { LABEL => 'none',
- PERMANENT => 'N' };
-
- if ($base_entitlement->{PERMANENT} eq 'Y') {
- return $pxt->user->org->slot_name($base_entitlement->{LABEL});
- }
-
- my @all_entitlements =
RHN::Entitlements->valid_system_entitlements_for_org($pxt->user->org_id);
- my @allowed_entitlements = grep { $_->{IS_BASE} eq 'Y' and
- ( $_->{LABEL} eq $base_entitlement->{LABEL} or
- $server->can_switch_base_entitlement($_->{LABEL})
- )
- } @all_entitlements;
-
- my @options = ( map { {label =>
$pxt->user->org->slot_name($_->{LABEL}),
- value => $_->{LABEL}},
- } @allowed_entitlements);
-
- if ($base_entitlement->{LABEL} eq 'none') {
- unshift @options,
- { label => 'None',
- value => 'none' };
- }
- else {
- unshift @options,
- { label => 'Unentitle System',
- value => 'unentitle' };
- }
-
- my $selectbox = new RHN::Form::Widget::Select (name => 'Base Entitlement',
- label => 'base_entitlement',
- default => $base_entitlement->{LABEL},
- options => \@options);
- return $selectbox->render;
-}
-
sub addon_entitlements {
my $pxt = shift;
my $server = shift;
@@ -671,52 +629,6 @@ sub addon_entitlements {
return join(", ", @addon_entitlements);
}
-sub addon_entitlement_box {
- my $pxt = shift;
- my $server = shift;
-
- my @system_entitlements = $server->entitlements;
- my ($base_entitlement) = grep { $_->{IS_BASE} eq 'Y' }
@system_entitlements;
- my %addon_entitlements = map { ($_->{LABEL}, $_) }
- grep { $_->{IS_BASE} eq 'N' } @system_entitlements;
-
- if (not $base_entitlement) {
- return "A system must have a base entitlement to have add-on
entitlements.";
- }
-
- my @all_entitlements =
RHN::Entitlements->valid_system_entitlements_for_org($pxt->user->org_id);
- my %allowed_entitlements = map { ($_->{LABEL}, $_) }
- grep { $_->{IS_BASE} eq 'N' and
- $server->can_entitle_server($_->{LABEL}) } @all_entitlements;
-
- my @options;
- my @selected;
-
- foreach my $ent (@all_entitlements) {
- if (exists $addon_entitlements{$ent->{LABEL}} or
- exists $allowed_entitlements{$ent->{LABEL}}) {
- my $disabled = (exists $addon_entitlements{$ent->{LABEL}} and
- $ent->{PERMANENT} eq 'Y') ? 1 : 0;
-
- push @options, { label =>
$pxt->user->org->slot_name($ent->{LABEL}),
- value => $ent->{LABEL},
- disabled => $disabled };
- push(@selected, $ent->{LABEL}) if exists $addon_entitlements{$ent->{LABEL}};
- }
- }
-
- unless (@options) {
- return "No add-on entitlements available.";
- }
-
- my $boxes = new RHN::Form::Widget::CheckboxGroup (name => 'Add-On
Entitlements',
- label => 'addon_entitlements',
- default => \@selected,
- options => \@options);
-
- return join("<br/>\n", $boxes->render);
-}
-
sub reboot_server_cb {
my $pxt = shift;
my $sid = $pxt->param('sid');
@@ -1190,47 +1102,6 @@ sub delete_servers_cb {
$pxt->redirect('/rhn/systems/Overview.do?empty_set=true&return_url=/rhn/systems/Overview.do?'
. $message);
}
-sub store_bounce {
- my $pxt = shift;
- my %params = @_;
-
- my $ret = $params{__block__};
-
- # A bit of an ugly and hurried loop here, but it'll work.
-
- my @ent_types = ('sw_mgr_', 'enterprise_');
- my $ent_type;
-
- foreach $ent_type (@ent_types) {
- my $eg = $ent_type . "entitled";
- my ($server_count, $entitled_server_count, $entitlement_count) =
$pxt->user->org->entitlement_gap($eg);
- my $recommend = $server_count - $entitlement_count;
- $recommend = int($recommend/5 + 1) * 5;
- $recommend = 5 if $recommend < 5;
-
- my $remaining = $entitlement_count - $entitled_server_count;
- $remaining = 0 if $remaining < 0;
-
- my $rq = $ent_type . 'recommend_quantity';
- my $edc = $ent_type . 'entitled_count';
- my $etc = $ent_type . 'entitlement_count';
- my $er = $ent_type . 'entitlement_remaining';
-
- $ret =~ s/\{$rq\}/$recommend/gms;
-
- $ret =~ s/\{$edc\}/$entitled_server_count/gms;
- $ret =~ s/\{$etc\}/defined $entitlement_count ? $entitlement_count :
'(unlimited)'/egms;
- $ret =~ s/\{$er\}/defined $entitlement_count ? $remaining :
'(unlimited)'/egms;
-
- $ret =~ s/\{quantity\}/$pxt->param('quantity') || 5/egms;
-
- $ret =~ s/\{rhn_$_\}/$pxt->dir_config("rhn_$_")/egsmi
- foreach qw/item_code store_url/;
- }
-
- return $ret;
-}
-
sub system_activation_key_form {
my $pxt = shift;
my %attr = @_;