web/modules/rhn/RHN/DB/Scheduler.pm | 69 -----------------
web/modules/sniglets/Sniglets/ErrataEditor.pm | 29 -------
web/modules/sniglets/Sniglets/Forms.pm | 105 --------------------------
web/modules/sniglets/Sniglets/Packages.pm | 20 ----
4 files changed, 223 deletions(-)
New commits:
commit 0cb3c9445dfa65d19370f37345c6035d354b3b20
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 22:25:21 2010 +0100
Callbacks rhn:sscd_confirm_package_upgrades, rhn:sscd_confirm_package_installations,
and rhn:sscd_confirm_package_removals not used, removing.
Note that the actual functions were not removed as they are still
used from elsewhere.
diff --git a/web/modules/sniglets/Sniglets/Packages.pm
b/web/modules/sniglets/Sniglets/Packages.pm
index 36b8a79..2d63df8 100644
--- a/web/modules/sniglets/Sniglets/Packages.pm
+++ b/web/modules/sniglets/Sniglets/Packages.pm
@@ -52,11 +52,8 @@ sub register_callbacks {
my $class = shift;
my $pxt = shift;
- $pxt->register_callback('rhn:sscd_confirm_package_upgrades' =>
\&sscd_confirm_package_upgrades_cb);
- $pxt->register_callback('rhn:sscd_confirm_package_installations' =>
\&sscd_confirm_package_installations_cb);
$pxt->register_callback('rhn:sscd_confirm_patch_installations' =>
\&sscd_confirm_package_installations_cb);
$pxt->register_callback('rhn:sscd_confirm_patchset_installations' =>
\&sscd_confirm_package_installations_cb);
- $pxt->register_callback('rhn:sscd_confirm_package_removals' =>
\&sscd_confirm_package_removals_cb);
$pxt->register_callback('rhn:sscd_confirm_patch_removals' =>
\&sscd_confirm_package_removals_cb);
$pxt->register_callback('rhn:upload-answerfile-cb' =>
\&upload_answerfile_cb);
commit 8d4f5792619e5e0c200ba5f12611524faf00a78f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 22:23:47 2010 +0100
Removal of sscd_confirm_package_verification_cb made sscd_schedule_package_verify
unused, removing.
diff --git a/web/modules/rhn/RHN/DB/Scheduler.pm b/web/modules/rhn/RHN/DB/Scheduler.pm
index 6f890e3..07b31b0 100644
--- a/web/modules/rhn/RHN/DB/Scheduler.pm
+++ b/web/modules/rhn/RHN/DB/Scheduler.pm
@@ -408,75 +408,6 @@ EOQ
return \%actions;
}
-sub sscd_schedule_package_verify {
- my $class = shift;
- my %params = @_;
-
- my ($earliest, $org_id, $user_id) =
- map { $params{"-" . $_} } qw/earliest org_id user_id/;
-
- my $dbh = RHN::DB->connect;
- my $query = <<EOQ;
-SELECT DISTINCT S.id, S.name
- FROM rhnServer S,
- rhnServerPackage SP,
- rhnSet SYSTEM_SET
- WHERE SYSTEM_SET.user_id = ?
- AND SYSTEM_SET.label = 'system_list'
- AND SYSTEM_SET.element = SP.server_id
- AND SP.name_id IN (SELECT element FROM rhnSet WHERE user_id = SYSTEM_SET.user_id AND
label = 'sscd_verify_package_list')
- AND SP.server_id = S.id
-ORDER BY UPPER(S.name)
-EOQ
-
- my $sth = $dbh->prepare($query);
-
- $sth->execute($user_id);
-
- my @actions;
- while (my ($server_id, $server_name) = $sth->fetchrow) {
- my $action_name = "Package Verify for " . $server_name;
-
- my ($action_id, $action_stat_id) = $class->make_base_action(-org_id =>
$org_id,
- -user_id => $user_id,
- -type_label => 'packages.verify',
- -earliest => $earliest,
- -action_name => $action_name,
- );
-
- push @actions, { action_id => $action_id, status_id => $action_stat_id,
server_id => $server_id };
- }
-
- foreach my $action (@actions) {
- $query = <<EOQ;
-INSERT INTO rhnServerAction (server_id, action_id, status) VALUES (?, ?, ?)
-EOQ
- $sth = $dbh->prepare($query);
- $sth->execute($action->{server_id}, $action->{action_id},
$action->{status_id});
-
- $query = <<EOQ;
-INSERT INTO rhnActionPackage (id, action_id, name_id, evr_id)
-(
-SELECT rhn_act_p_id_seq.nextval, ?, SP.name_id, SP.evr_id
- FROM rhnServerPackage SP, rhnSet PACKAGE_LIST
- WHERE PACKAGE_LIST.user_id = ?
- AND PACKAGE_LIST.label = 'sscd_verify_package_list'
- AND SP.server_id = ?
- AND SP.name_id = PACKAGE_LIST.element
- AND SP.evr_id = PACKAGE_LIST.element_two
-)
-EOQ
- $sth = $dbh->prepare($query);
- $sth->execute($action->{action_id}, $user_id, $action->{server_id});
- }
-
- $dbh->commit();
-
- osa_wakeup_tickle();
-
- return \@actions;
-}
-
# one or more package install or remove for a single system
sub sscd_schedule_package_removal {
commit f0ef8d979a7d0260cc0c4f9f5fadad1b20a915b5
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 22:22:50 2010 +0100
rhn:sscd_confirm_package_verification not used, removing, as well as
sscd_confirm_package_verification_cb.
diff --git a/web/modules/sniglets/Sniglets/Packages.pm
b/web/modules/sniglets/Sniglets/Packages.pm
index 6304ac9..36b8a79 100644
--- a/web/modules/sniglets/Sniglets/Packages.pm
+++ b/web/modules/sniglets/Sniglets/Packages.pm
@@ -58,7 +58,6 @@ sub register_callbacks {
$pxt->register_callback('rhn:sscd_confirm_patchset_installations' =>
\&sscd_confirm_package_installations_cb);
$pxt->register_callback('rhn:sscd_confirm_package_removals' =>
\&sscd_confirm_package_removals_cb);
$pxt->register_callback('rhn:sscd_confirm_patch_removals' =>
\&sscd_confirm_package_removals_cb);
- $pxt->register_callback('rhn:sscd_confirm_package_verification' =>
\&sscd_confirm_package_verification_cb);
$pxt->register_callback('rhn:upload-answerfile-cb' =>
\&upload_answerfile_cb);
}
@@ -478,22 +477,6 @@ sub sscd_confirm_package_removals_cb {
}
}
-sub sscd_confirm_package_verification_cb {
- my $pxt = shift;
-
- if ($pxt->dirty_param('sscd_confirm_package_verification')) {
- my $earliest = Sniglets::ServerActions->parse_date_pickbox($pxt);
-
- my $actions = RHN::Scheduler->sscd_schedule_package_verify(-org_id =>
$pxt->user->org_id, -user_id => $pxt->user->id, -earliest =>
$earliest);
- my $package_set = RHN::Set->lookup(-label =>
'sscd_verify_package_list', -uid => $pxt->user->id);
- $package_set->empty;
- $package_set->commit;
-
- $pxt->push_message(site_info => "Package verifications scheduled.");
- $pxt->redirect("/network/systems/ssm/packages/index.pxt");
- }
-}
-
sub sscd_confirm_package_installations_cb {
my $pxt = shift;
my $mode = $pxt->dirty_param('mode') || '';
commit 08cddded2bf882f36614ee6eb88b98d84086e127
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 22:16:47 2010 +0100
Removal of edit_template_string.xml made rhn:catch_form and thus catch_form_cb and
catch_form unused, removing.
diff --git a/web/modules/sniglets/Sniglets/Forms.pm
b/web/modules/sniglets/Sniglets/Forms.pm
index 4a65cd7..447b23d 100644
--- a/web/modules/sniglets/Sniglets/Forms.pm
+++ b/web/modules/sniglets/Sniglets/Forms.pm
@@ -30,111 +30,6 @@ use PXT::Utils;
use PXT::ACL;
-sub register_tags {
- my $class = shift;
- my $pxt = shift;
-}
-
-sub register_callbacks {
- my $class = shift;
- my $pxt = shift;
-
- $pxt->register_callback('rhn:catch_form', \&catch_form_cb);
-}
-
-sub catch_form_cb {
- my $pxt = shift;
-
- my $obj = catch_form($pxt);
- my $url;
-
- if ($obj) {
- $obj->commit;
-
- my $redirect_url = $pxt->dirty_param('url');
- my $id_formvar = $pxt->dirty_param('id_formvar');
- if ($redirect_url) {
- $url = $redirect_url;
- }
- else {
- $url = $pxt->uri;
- }
-
- $url = $url . '?' . $id_formvar . '=' . $obj->id;
- }
-
- $pxt->push_message(site_info => "Item updated.");
- $pxt->redirect($url) if $url;
-
- return;
-}
-
-sub catch_form {
- my $pxt = shift;
-
- my $file = $pxt->dirty_param('form_file');
-
- throw "Could not load form '$file'."
- unless ($file);
-
- my $pform = RHN::Form::Parser->parse_file($file);
-
- throw "'$pform' is not a RHN::Form::ParsedForm"
- unless (ref $pform && $pform->isa('RHN::Form::ParsedForm'));
-
- my $file_widget = new RHN::Form::Widget::Hidden(name => 'Form File',
- label => 'form_file',
- default => $file);
-
- $pform->add_widget($file_widget);
-
- my $acl_parser = new PXT::ACL (mixins => [ $pform->acl_mixins ]);
-# remove widgets based upon ACLs
- foreach my $widget ($pform->widgets) {
- next unless $widget->acl;
-
- if (not $acl_parser->eval_acl($pxt, $widget->acl)) {
- $pform->remove_widget($widget->label);
- }
- }
-
- my $form = $pform->prepare_response;
- my $errors = load_params($pxt, $form);
- my $source = $pxt->dirty_param('source');
-
- if (@{$errors}) {
- foreach my $error (@{$errors}) {
- $pxt->push_message(local_alert => $error);
- }
- return;
- }
-
- if ($source) {
- my $id_formvar = $pxt->dirty_param('id_formvar');
-
- PXT::Utils->untaint(\$source);
-
- eval "use $source";
- die $@ if $@;
-
- my $obj = $source->lookup(-id => $pxt->passthrough_param($id_formvar));
-
- foreach my $widget ($form->widgets) {
- my $label = $widget->label;
-
- next if $widget->isa('RHN::Form::Widget::Literal');
- next unless $obj->can($label);
-
- my $val = $widget->raw_value;
- $obj->$label($val);
- }
-
- return $obj;
- }
-
- return;
-}
-
sub load_params {
my $pxt = shift;
my $form = shift;
commit df3adb5fc41894d8ce1afc63a1bfac0a56c65053
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 22:12:38 2010 +0100
Removal of errata_cache_update.pxi made rhn:update_errata_cache and
update_errata_cache not used, removing.
diff --git a/web/modules/sniglets/Sniglets/ErrataEditor.pm
b/web/modules/sniglets/Sniglets/ErrataEditor.pm
index bf12bc3..75ab75f 100644
--- a/web/modules/sniglets/Sniglets/ErrataEditor.pm
+++ b/web/modules/sniglets/Sniglets/ErrataEditor.pm
@@ -32,35 +32,6 @@ sub register_tags {
$pxt->register_tag('rhn-unless-var' => \&unless_var, -5);
}
-sub register_callbacks {
- my $class = shift;
- my $pxt = shift;
-
- $pxt->register_callback('rhn:update_errata_cache' =>
\&update_errata_cache);
-}
-
-sub update_errata_cache {
- my $pxt = shift;
- my $eid = $pxt->param('eid');
-
- die "ErrataEditor::update_errata_cache called without eid"
- unless $eid;
-
- foreach my $cid (RHN::Errata->channels($eid)) {
- unless ($pxt->user->verify_channel_admin($cid)) {
- $pxt->redirect("/errors/permission.pxt");
- }
-
- RHN::ChannelEditor->schedule_errata_cache_update($pxt->user->org_id, $cid);
- }
-
- my $package_list_edited =
$pxt->session->get('errata_package_list_edited');
- $package_list_edited->{$eid} = 0;
- $pxt->session->set(errata_package_list_edited => $package_list_edited);
-
- $pxt->redirect($pxt->uri . "?eid=$eid");
-}
-
sub if_var {
my $pxt = shift;
my %attr = @_;