web/modules/sniglets/Sniglets/Org.pm | 17 ---
web/modules/sniglets/Sniglets/Search.pm | 157 --------------------------------
2 files changed, 174 deletions(-)
New commits:
commit 29f639b5af0f992fba52be6428e6cedab2b5319c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 14 15:00:58 2009 +0100
rhn-if-searched not used anywhere, removing, as well as if_searched.
diff --git a/web/modules/sniglets/Sniglets/Search.pm
b/web/modules/sniglets/Sniglets/Search.pm
index e05e82e..f56cc71 100644
--- a/web/modules/sniglets/Sniglets/Search.pm
+++ b/web/modules/sniglets/Sniglets/Search.pm
@@ -28,7 +28,6 @@ sub register_tags {
my $class = shift;
my $pxt = shift;
- $pxt->register_tag('rhn-if-searched' => \&if_searched, -10);
}
sub register_callbacks {
@@ -42,23 +41,6 @@ sub register_callbacks {
$pxt->register_callback('rhn:bar_search_cb' => \&bar_search_cb);
}
-sub if_searched {
- my $pxt = shift;
- my %params = @_;
- my $block = $params{__block__};
-
- if ($pxt->pnotes('searched')) {
- PXT::Debug->log(7, "searched...");
- return $block;
- }
- elsif ($pxt->dirty_param('search_string')) {
- return $block;
- }
-
- PXT::Debug->log(7, "not searched");
- return;
-}
-
sub validate_search_string {
my $class = shift;
my $pxt = shift;
commit cd1234c68bf84c84f4dd8872e1a60f7d2ea432b5
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 14 15:00:07 2009 +0100
rhn-system-search-form not used anywhere, removing, as well as system_search_form.
diff --git a/web/modules/sniglets/Sniglets/Search.pm
b/web/modules/sniglets/Sniglets/Search.pm
index 1f7c031..e05e82e 100644
--- a/web/modules/sniglets/Sniglets/Search.pm
+++ b/web/modules/sniglets/Sniglets/Search.pm
@@ -28,8 +28,6 @@ sub register_tags {
my $class = shift;
my $pxt = shift;
- $pxt->register_tag('rhn-system-search-form' =>
\&system_search_form);
-
$pxt->register_tag('rhn-if-searched' => \&if_searched, -10);
}
@@ -194,40 +192,6 @@ RHN::SearchTypes->register_type('system',
$system_searches);
my @integer_types = qw/search_id search_cpu_mhz_lt search_cpu_mhz_gt search_ram_lt
search_ram_gt search_checkin search_registered/;
-sub system_search_form {
- my $pxt = shift;
- my %params = @_;
-
- my $block = $params{__block__};
- my $search_string = $pxt->dirty_param('search_string') || '';
- my $search_set = $pxt->dirty_param('search_set') || 'all';
- my $view_mode = $pxt->dirty_param('view_mode') || 'search_simple';
- my $invert = $pxt->dirty_param('invert') || '';
-
- my $search = RHN::SearchTypes->find_type('system');
-
- my $search_select = $search->render_search_selectbox(pxt => $pxt, search_type
=> $view_mode);
-
- $search_string = Sniglets::Search->strip_invalid_chars($search_string, $view_mode);
-
- my %subst;
-
- $subst{all_checked} = $search_set eq 'all' ? '1' : '';
- $subst{system_list_checked} = $search_set eq 'system_list' ? '1' :
'';
-
- $subst{search_string} = PXT::Utils->escapeHTML($search_string);
- $subst{invert_checked} = $invert ? ' checked="1"' : '';
-
- $subst{search_options} = $search_select;
-
- my $return_block;
- $return_block .= PXT::HTML->form_start(-method => "POST");
- $return_block .= PXT::Utils->perform_substitutions($params{__block__}, \%subst);
- $return_block .= PXT::HTML->form_end;
-
- return $return_block;
-}
-
sub system_search_handler {
my $pxt = shift;
commit cd64eea628367623ab31628df9470a3ebd948e3f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 14 14:59:12 2009 +0100
rhn-package-search-form not used anywhere, removing, as well as package_search_form.
diff --git a/web/modules/sniglets/Sniglets/Search.pm
b/web/modules/sniglets/Sniglets/Search.pm
index 7abd1b5..1f7c031 100644
--- a/web/modules/sniglets/Sniglets/Search.pm
+++ b/web/modules/sniglets/Sniglets/Search.pm
@@ -28,7 +28,6 @@ sub register_tags {
my $class = shift;
my $pxt = shift;
- $pxt->register_tag('rhn-package-search-form' =>
\&package_search_form);
$pxt->register_tag('rhn-system-search-form' =>
\&system_search_form);
$pxt->register_tag('rhn-if-searched' => \&if_searched, -10);
@@ -291,54 +290,6 @@ $package_searches->set_name('package_search');
RHN::SearchTypes->register_type('package', $package_searches);
-sub package_search_form {
- my $pxt = shift;
- my %params = @_;
-
- my $search = RHN::SearchTypes->find_type('package');
- my $search_select = $search->render_search_selectbox(pxt => $pxt);
-
- my $search_arches;
-
- # sigh, this is lame, but almost nothing in the ListView area
- # understands multivalued formvars, so...
- my %arches;
- $arches{$_} = $pxt->dirty_param($_)
- for qw/channel_arch_ia32 channel_arch_ia64 channel_arch_x86_64/;
- my $no_selected_arched;
- $no_selected_arched = 1
- unless grep { defined $arches{$_} } qw/channel_arch_ia32 channel_arch_ia64
channel_arch_x86_64/;
-
-
- for my $arch (Sniglets::Packages->search_arch_list) {
- my ($label, $name) = @$arch;
-
- $search_arches .= PXT::HTML->checkbox(-name =>
"channel_arch_$label",
- -value => "channel-$label",
- -checked => $arches{"channel_arch_$label"} ? 1 : 0);
- $search_arches .= "$name ";
- }
-
- my $search_smart_channels;
- $search_smart_channels = PXT::HTML->checkbox(-name =>
'search_subscribed_channels',
- -value => 1,
- -checked => ($pxt->dirty_param('search_subscribed_channels') ||
$no_selected_arched || 0));
- $search_smart_channels .= "Channels relevant to your systems";
-
- my $return_block = '';
- $return_block .= PXT::HTML->form_start(-method => "POST");
- $return_block .= PXT::Utils->perform_substitutions($params{__block__},
- { 'search_options' => $search_select,
- 'search_string' =>
PXT::Utils->escapeHTML($pxt->dirty_param('search_string') || ''),
- 'search_arches' => $search_arches,
- 'search_smart_channels' => $search_smart_channels,
- }
- );
- $return_block .= PXT::HTML->form_end;
-
- return $return_block;
-}
-
sub package_search_handler {
my $pxt = shift;
commit 67e71d607bbf9f1db471e2d89088e08d864694fb
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 14 14:58:23 2009 +0100
rhn-errata-search-form not used anywhere, removing, as well as errata_search_form.
diff --git a/web/modules/sniglets/Sniglets/Search.pm
b/web/modules/sniglets/Sniglets/Search.pm
index 90bb323..7abd1b5 100644
--- a/web/modules/sniglets/Sniglets/Search.pm
+++ b/web/modules/sniglets/Sniglets/Search.pm
@@ -28,7 +28,6 @@ sub register_tags {
my $class = shift;
my $pxt = shift;
- $pxt->register_tag('rhn-errata-search-form' =>
\&errata_search_form);
$pxt->register_tag('rhn-package-search-form' =>
\&package_search_form);
$pxt->register_tag('rhn-system-search-form' =>
\&system_search_form);
@@ -266,24 +265,6 @@ $errata_searches->set_name('errata_search');
RHN::SearchTypes->register_type('errata', $errata_searches);
-sub errata_search_form {
- my $pxt = shift;
- my %params = @_;
-
- my $search = RHN::SearchTypes->find_type('errata');
- my $search_select = $search->render_search_selectbox(pxt => $pxt);
-
- my $return_block = '';
- $return_block .= PXT::HTML->form_start(-method => "POST");
- $return_block .= PXT::Utils->perform_substitutions($params{__block__},
- { 'search_options' => $search_select,
- 'search_string' =>
PXT::Utils->escapeHTML($pxt->dirty_param('search_string') || '') }
- );
- $return_block .= PXT::HTML->form_end;
-
- return $return_block;
-}
-
sub errata_search_handler {
my $pxt = shift;
commit f866fa21c084823bc7facf3605eb2ed290a11d94
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 14 14:56:13 2009 +0100
rhn-search-bar not used anywhere, removing, as well as search_bar.
diff --git a/web/modules/sniglets/Sniglets/Search.pm
b/web/modules/sniglets/Sniglets/Search.pm
index 1eb01cd..90bb323 100644
--- a/web/modules/sniglets/Sniglets/Search.pm
+++ b/web/modules/sniglets/Sniglets/Search.pm
@@ -28,8 +28,6 @@ sub register_tags {
my $class = shift;
my $pxt = shift;
- $pxt->register_tag('rhn-search-bar' => \&search_bar);
-
$pxt->register_tag('rhn-errata-search-form' =>
\&errata_search_form);
$pxt->register_tag('rhn-package-search-form' =>
\&package_search_form);
$pxt->register_tag('rhn-system-search-form' =>
\&system_search_form);
@@ -394,39 +392,6 @@ sub package_search_handler {
}
}
-# search bar. default to your last search, or systems if you're
-# logged in, or package if you're not. whew.
-sub search_bar {
- my $pxt = shift;
-
- my $default_search = $pxt->session->get('last_search_type');
-
- my @options;
- if ($pxt->user and
$pxt->user->org->has_entitlement('sw_mgr_enterprise')) {
- push @options, [ 'Systems', 'systems', 0 ];
- $default_search ||= 'systems';
- }
- $default_search ||= 'packages';
-
- push @options, [ 'Packages', 'packages', 0 ];
- push @options, [ 'Errata', 'errata', 0 ];
-
- for my $option (@options) {
- $option->[2]++ if $option->[1] eq $default_search;
- }
-
- my $ret = '';
- $ret .= PXT::HTML->form_start(-method => 'GET', -action =>
"/rhn/Search.do");
- $ret .= PXT::HTML->select(-name => 'search_type',
- -options => \@options);
- $ret .= PXT::HTML->text(-name => 'search_string', -length => 40, -size
=> 20);
- $ret .= PXT::HTML->hidden(-name => 'submitted', -value =>
'true');
- $ret .= PXT::HTML->submit_image(-src => '/img/button-search.gif', -border
=> 0, -align => "top");
- $ret .= PXT::HTML->form_end;
-
- return $ret;
-}
-
sub bar_search_cb {
my $pxt = shift;
commit fc9509f97725a88e37c538ccdc6e46ad6e6a2aee
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 14 14:54:22 2009 +0100
rhn-org-entitlement-name not used anywhere, removing, as well as
org_entitlement_name.
diff --git a/web/modules/sniglets/Sniglets/Org.pm b/web/modules/sniglets/Sniglets/Org.pm
index ceae42a..98bffa0 100644
--- a/web/modules/sniglets/Sniglets/Org.pm
+++ b/web/modules/sniglets/Sniglets/Org.pm
@@ -29,7 +29,6 @@ sub register_tags {
my $class = shift;
my $pxt = shift;
- $pxt->register_tag('rhn-org-entitlement-name' =>
\&org_entitlement_name, -5);
}
sub register_callbacks {
@@ -49,22 +48,6 @@ sub reset_form {
reset_and_commit_set($pxt->user->id, 'new_cert_service_set');
}
-sub org_entitlement_name {
- my $pxt = shift;
- my %attr = @_;
-
- my $slot = $attr{type};
-
- throw "No type in call to org_entitlement_name"
- unless $slot;
-
- my $block = $attr{__block__} || '{entitlement}';
-
- $block = PXT::Utils->perform_substitutions($block, { entitlement =>
$pxt->user->org->slot_name($slot) });
-
- return $block;
-}
-
sub reset_and_commit_set {
my $uid = shift;
my $label = shift;