web/modules/sniglets/Sniglets/ServerActions.pm | 53 -------------------------
web/modules/sniglets/Sniglets/Utils.pm | 47 ----------------------
2 files changed, 100 deletions(-)
New commits:
commit 0eadbef5f7f782bf120e0828e77f809263bd121f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 14 15:14:09 2009 +0100
rhn-country-select not used anywhere, removing, as well as country_select.
diff --git a/web/modules/sniglets/Sniglets/Utils.pm
b/web/modules/sniglets/Sniglets/Utils.pm
index a9cf16f..1108b56 100644
--- a/web/modules/sniglets/Sniglets/Utils.pm
+++ b/web/modules/sniglets/Sniglets/Utils.pm
@@ -23,7 +23,6 @@ sub register_tags {
my $class = shift;
my $pxt = shift;
- $pxt->register_tag("rhn-country-select", \&country_select);
$pxt->register_tag("rhn-bugzilla-link", \&rhn_bugzilla_link);
$pxt->register_tag("rhn-redirect", \&rhn_redirect);
}
@@ -90,18 +89,4 @@ EOC
}
}
-sub country_select {
- my $pxt = shift;
- my %params = @_;
-
- my $var_name = $params{var_name};
- my $var_value = $params{var_value};
- my $var_lang = $params{var_lang};
- my $allow_empty = $params{allow_empty};
-
-# warn "var name == $var_name, var value == $var_value";
-
- return PXT::Utils->country_selectbox($var_name, $var_lang, $var_value, undef,
$allow_empty);
-}
-
1;
commit 73e5a13e5adf1da25b8b4d4103765caf5d9442bc
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 14 15:13:21 2009 +0100
rhn-debug not used anywhere, removing, as well as debug_dump.
diff --git a/web/modules/sniglets/Sniglets/Utils.pm
b/web/modules/sniglets/Sniglets/Utils.pm
index b59358c..a9cf16f 100644
--- a/web/modules/sniglets/Sniglets/Utils.pm
+++ b/web/modules/sniglets/Sniglets/Utils.pm
@@ -23,7 +23,6 @@ sub register_tags {
my $class = shift;
my $pxt = shift;
- $pxt->register_tag("rhn-debug", \&debug_dump);
$pxt->register_tag("rhn-country-select", \&country_select);
$pxt->register_tag("rhn-bugzilla-link", \&rhn_bugzilla_link);
$pxt->register_tag("rhn-redirect", \&rhn_redirect);
@@ -105,35 +104,4 @@ sub country_select {
return PXT::Utils->country_selectbox($var_name, $var_lang, $var_value, undef,
$allow_empty);
}
-sub debug_dump {
- my $pxt = shift;
-
- my $ret = '';
-
- if ( $pxt->user() ) {
- return $ret unless ( $pxt->user->login =~ /^rhn7/ );
- } else {
- # This needs to be uncommented later
- return '';
- }
-
-
- $ret .= "<p><ul>\n";
- foreach my $p ($pxt->param) {
- $ret .= "<li>$p: " . $pxt->param($p) . "<br>\n";
- }
- $ret .= "</li></p>\n<br>\n<br>\n";
-
- if ($pxt->user) {
- $ret .= "<strong>You are currently logged
in.</strong><br>\n";
- $ret .= "Username: " . $pxt->user->login . "<br>\n";
- $ret .= "User id: " . $pxt->session->uid . "<br>\n";
- }
-
-# $ret .= "Session id: " . $pxt->session->key .
"<br>\n";
- $ret .= "Session dump: <pre>" . Data::Dumper->Dump([
$pxt->session ]) . "</pre>\n";
-
- return $ret;
-}
-
1;
commit 71c36a004ad9ae0dc8cf3f4ec9b28fff068be7fa
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 14 15:12:17 2009 +0100
rhn-latest-config-actions not used anywhere, removing, as well as
latest_config_actions.
diff --git a/web/modules/sniglets/Sniglets/ServerActions.pm
b/web/modules/sniglets/Sniglets/ServerActions.pm
index 2cabaa7..a1f3369 100644
--- a/web/modules/sniglets/Sniglets/ServerActions.pm
+++ b/web/modules/sniglets/Sniglets/ServerActions.pm
@@ -42,7 +42,6 @@ sub register_tags {
$pxt->register_tag('rhn-schedule-action-interface' =>
\&schedule_action_interface, 2);
$pxt->register_tag('rhn-reschedule-form-if-failed-action' =>
\&reschedule_form_if_failed_action);
- $pxt->register_tag('rhn-latest-config-actions' =>
\&latest_config_actions);
$pxt->register_tag('rhn-package-event-result' =>
\&package_event_result);
}
@@ -443,57 +442,6 @@ my %config_actions = ('configfiles.verify' =>
'verification',
'configfiles.upload' => 'upload',
'configfiles.deploy' => 'deploy');
-sub latest_config_actions {
- my $pxt = shift;
- my %attr = @_;
-
- my $type = $attr{type};
-
- die "Invalid type"
- unless grep { $_ eq $type } keys %config_actions;
-
- my @actions = RHN::Server->get_latest_actions(-server_id =>
$pxt->param('sid'), -type => $type);
-
- my $template = $attr{__block__};
- my $html;
-
- my $sid = $pxt->param('sid');
-
- my $upload_namespace_id = RHN::ConfigChannel->vivify_server_config_channel($sid,
'server_import');
-
- foreach my $row (@actions) {
- my %subst;
- $subst{action_type_name} = $config_actions{$attr{type}};
- $subst{action_type_name} =~ s/^(.)/\U$1/;
- $subst{action_status} = $row->{STATUS};
- $subst{action_status} =~ s/^(.)/\L$1/;
- $subst{action_time} = $pxt->user->convert_time($row->{LAST_MODIFIED});
-
- my $link_text = $row->{STATUS} eq 'Completed' ? 'View Results' :
'View Status';
-
- if ( (grep { $type eq $_ } qw/configfiles.verify configfiles.deploy/)
- or ($row->{STATUS} ne 'Completed') ) {
- $subst{results_link} =
- PXT::HTML->link(sprintf('/network/systems/details/history/event.pxt?sid=%d&hid=%d',
$sid, $row->{ID}),
- $link_text);
- }
- elsif ( $type eq 'configfiles.upload' ) {
- $subst{results_link} =
- PXT::HTML->link(sprintf('/rhn/systems/details/configuration/ViewModifyLocalPaths.do?sid=%d',
- $sid), $link_text);
- }
- elsif ( $type eq 'configfiles.diff') {
- $subst{results_link} =
- PXT::HTML->link(sprintf('/network/systems/details/history/event.pxt?sid=%d&hid=%d',
- $sid, $row->{ID}), $link_text);
- }
-
- $html .= PXT::Utils->perform_substitutions($template, \%subst);
- }
-
- return $html;
-}
-
sub schedule_config_action_cb {
my $pxt = shift;
my $sid = $pxt->param('sid');
commit fce16cfe6e9fafe8c43fa341d77cda014d1836f5
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 14 15:11:24 2009 +0100
rhn-date-pickbox not used anywhere, removing as dead register.
diff --git a/web/modules/sniglets/Sniglets/ServerActions.pm
b/web/modules/sniglets/Sniglets/ServerActions.pm
index f8a1ee2..2cabaa7 100644
--- a/web/modules/sniglets/Sniglets/ServerActions.pm
+++ b/web/modules/sniglets/Sniglets/ServerActions.pm
@@ -41,7 +41,6 @@ sub register_tags {
$pxt->register_tag('rhn-raw-script-output' => \&raw_script_output);
$pxt->register_tag('rhn-schedule-action-interface' =>
\&schedule_action_interface, 2);
- $pxt->register_tag('rhn-date-pickbox' => \&date_pickbox, 1);
$pxt->register_tag('rhn-reschedule-form-if-failed-action' =>
\&reschedule_form_if_failed_action);
$pxt->register_tag('rhn-latest-config-actions' =>
\&latest_config_actions);