java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml | 6
+++---
java/code/src/com/redhat/rhn/frontend/action/tasko/DeleteScheduleAction.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 669cd9890f5717e72fe8f76b56906c58b55f0b46
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 20 15:26:46 2011 +0200
659138 - do not forward parameter map in case of success
(we would forward also submitted param, that confuses csfr token check
diff --git a/java/code/src/com/redhat/rhn/frontend/action/tasko/DeleteScheduleAction.java
b/java/code/src/com/redhat/rhn/frontend/action/tasko/DeleteScheduleAction.java
index 9c4af32..923063b 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/tasko/DeleteScheduleAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/tasko/DeleteScheduleAction.java
@@ -79,7 +79,7 @@ public class DeleteScheduleAction extends RhnAction {
}
return getStrutsDelegate().forwardParams(
mapping.findForward("success"),
- request.getParameterMap());
+ new HashMap());
}
catch (TaskomaticApiException e) {
createErrorMessage(request,
commit 210dbc4a9669ea5b381787791a90d5f26408a254
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 20 18:50:50 2011 +0200
706399 - "<" is not the best thing in xml
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
index caf9ddf..e038aa1 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
@@ -165,7 +165,7 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id
where cp.channel_id = csc.channel_id
and rhnChannelNewestPackage.package_id = cp.package_id
and rhnServerChannel.server_id = csc.server_id
- and cp.channel_id < rhnChannelNewestPackage.channel_id
+ and cp.channel_id < rhnChannelNewestPackage.channel_id
)
and not exists (
-- rule out records where the server has the same package name with higher evr
@@ -173,7 +173,7 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id
where rhnServerPackage.server_id = sp.server_id
and rhnServerPackage.name_id = sp.name_id
and sp.evr_id = sevr.id
- and rhnPackageEVR.evr <= sevr.evr
+ and rhnPackageEVR.evr <= sevr.evr
and rhnServerPackage.package_arch_id = puac.package_arch_id
and puac.package_upgrade_arch_id = sp.package_arch_id
)
@@ -184,7 +184,7 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id
and csc.channel_id = ocnp.channel_id
and rhnServerPackage.name_id = ocnp.name_id
and ocnp.evr_id = oevr.id
- and rhnPackageEVR.evr < oevr.evr
+ and rhnPackageEVR.evr < oevr.evr
and rhnServerPackage.package_arch_id = puac.package_arch_id
and puac.package_upgrade_arch_id = ocnp.package_arch_id
)
Show replies by date