rel-eng/packages/spacewalk-web | 2 -
web/modules/rhn/RHN/DB/Action.pm | 44 +++++++++++----------------------------
web/spacewalk-web.spec | 5 +++-
3 files changed, 18 insertions(+), 33 deletions(-)
New commits:
commit 3b491d215cad33a41a05883390d37c63920bed00
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Nov 23 15:26:07 2011 +0100
Automatic commit of package [spacewalk-web] release [1.6.29-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index f51809d..782407e 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.6.28-1 web/
+1.6.29-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index ba09fcf..60842e7 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.6.28
+Version: 1.6.29
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk/
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -256,6 +256,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Wed Nov 23 2011 Jan Pazdziora 1.6.29-1
+- Fixing cancel a scheduled action on a server.
+
* Wed Nov 16 2011 Tomas Lestach <tlestach(a)redhat.com> 1.6.28-1
- 754379 - fix deletion-url in pxt pages (tlestach(a)redhat.com)
commit 91b2ab3bcb08aa0d051f04b72d43f81f29009c71
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Nov 21 11:16:12 2011 +0100
Fixing cancel a scheduled action on a server.
Based on Greg W.'s patch.
diff --git a/web/modules/rhn/RHN/DB/Action.pm b/web/modules/rhn/RHN/DB/Action.pm
index fe101f6..8dcb88c 100644
--- a/web/modules/rhn/RHN/DB/Action.pm
+++ b/web/modules/rhn/RHN/DB/Action.pm
@@ -168,9 +168,6 @@ sub cancel_pending_for_system {
my $dbh = $params{transaction} || RHN::DB->connect;
my $sth = $dbh->prepare(<<EOQ);
-DECLARE
-
-cursor pending_actions is
SELECT A.id
FROM rhnAction A,
rhnServerAction SA
@@ -178,18 +175,15 @@ SELECT A.id
AND SA.status = 0
AND SA.action_id = A.id
AND A.prerequisite IS NULL
-ORDER BY A.id;
-
-BEGIN
-
-for action in pending_actions loop
- rhn_server.remove_action(:server_id, action.id);
-end loop;
-END;
+ORDER BY A.id
EOQ
$sth->execute_h(server_id => $params{server_id});
+ while (my @results = $sth->fetchrow()) {
+ $dbh->call_procedure('rhn_server.remove_action', $params{server_id},
$results[0]);
+ }
+
if (defined $params{transaction}) {
return $params{transaction};
}
@@ -207,12 +201,7 @@ sub delete_set_from_action {
my $dbh = RHN::DB->connect;
-
-
my $query = <<EOQ;
-DECLARE
-
-cursor selected_servers is
SELECT SA.server_id
FROM rhnServerAction SA, rhnSet ST
WHERE ST.user_id = :user_id
@@ -220,16 +209,13 @@ SELECT SA.server_id
AND ST.element = SA.server_id
AND SA.action_id = :action_id
AND SA.status = 0;
-
-BEGIN
-for server in selected_servers loop
- rhn_server.remove_action(server.server_id, :action_id);
-end loop;
-END;
EOQ
my $sth = $dbh->prepare($query);
$sth->execute_h(action_id => $aid, user_id => $uid, label => $set_name);
+ while (my @results = $sth->fetchrow()) {
+ $dbh->call_procedure('rhn_server.remove_action', $results[0], $aid);
+ }
$dbh->commit;
}
@@ -242,9 +228,6 @@ sub delete_system_from_action_set {
my $dbh = RHN::DB->connect;
my $query = <<EOQ;
-DECLARE
-
-cursor selected_actions is
SELECT SA.action_id
FROM rhnSet ST, rhnServerAction SA
WHERE ST.user_id = :user_id
@@ -252,16 +235,15 @@ SELECT SA.action_id
AND SA.server_id = :server_id
AND ST.element = SA.action_id
AND SA.status = 0;
-
-BEGIN
-for action in selected_actions loop
- rhn_server.remove_action(:server_id, action.action_id);
-end loop;
-END;
EOQ
my $sth = $dbh->prepare($query);
$sth->execute_h(server_id => $sid, user_id => $uid, label => $set_name);
+
+ while (my @results = $sth->fetchrow()) {
+ $dbh->call_procedure('rhn_server.remove_action', $sid, $results[0]);
+ }
+
$dbh->commit;
}