java/code/src/com/redhat/rhn/frontend/action/errata/PackagePushSetupAction.java | 10
++++++----
java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.jsp | 1 +
java/code/webapp/WEB-INF/pages/errata/packagepush.jsp | 1 +
java/code/webapp/WEB-INF/struts-config.xml | 4
++--
4 files changed, 10 insertions(+), 6 deletions(-)
New commits:
commit 2726ca31970b36b97977e866ce37f63067a58367
Author: Jason Dobies <jason.dobies(a)redhat.com>
Date: Wed Aug 19 14:36:13 2009 -0400
518262 - Fixed select all buttons when selecting erratum packages to push to a
channel.
The issue was two fold:
- The non-setup pages were configured to redirect back to the setup pages.
- The setup pages always cleared the sets; they needed to not clear if it was a
submitted page leading into it.
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/errata/PackagePushSetupAction.java
b/java/code/src/com/redhat/rhn/frontend/action/errata/PackagePushSetupAction.java
index 078a28c..0496703 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/errata/PackagePushSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/errata/PackagePushSetupAction.java
@@ -41,11 +41,9 @@ import javax.servlet.http.HttpServletResponse;
/**
* PackagePushSetupAction
- * @version $Rev$
*/
public class PackagePushSetupAction extends RhnListAction {
-
/**
* {@inheritDoc}
*/
@@ -53,6 +51,7 @@ public class PackagePushSetupAction extends RhnListAction {
ActionForm formIn,
HttpServletRequest request,
HttpServletResponse response) {
+
RequestContext rctx = new RequestContext(request);
User user = rctx.getLoggedInUser();
@@ -79,8 +78,11 @@ public class PackagePushSetupAction extends RhnListAction {
Iterator i = set.iterator();
RhnSet packageSet = RhnSetDecl.PACKAGES_TO_PUSH.get(user);
- packageSet.clear();
- RhnSetManager.store(packageSet);
+
+ if (!rctx.isSubmitted()) {
+ packageSet.clear();
+ RhnSetManager.store(packageSet);
+ }
/* Here we loop through the set of channels the user just selected
* and prompt them if they would like to push the packages in
diff --git a/java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.jsp
b/java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.jsp
index 527ac47..bb37094 100644
--- a/java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/addpackagepackagepush.jsp
@@ -18,6 +18,7 @@
<c:set var="pageList" value="${requestScope.pageList}" />
<html:form action="/errata/manage/AddPackagePackagePushSubmit">
<%@ include file="/WEB-INF/pages/common/fragments/errata/packagepush.jspf"
%>
+<rhn:submitted/>
</html:form>
</body>
</html>
diff --git a/java/code/webapp/WEB-INF/pages/errata/packagepush.jsp
b/java/code/webapp/WEB-INF/pages/errata/packagepush.jsp
index b5e394e..31527b1 100644
--- a/java/code/webapp/WEB-INF/pages/errata/packagepush.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/packagepush.jsp
@@ -18,6 +18,7 @@
<c:set var="pageList" value="${requestScope.pageList}" />
<html:form action="/errata/manage/PackagePushSubmit">
<%@ include file="/WEB-INF/pages/common/fragments/errata/packagepush.jspf"
%>
+<rhn:submitted/>
</html:form>
</body>
</html>
diff --git a/java/code/webapp/WEB-INF/struts-config.xml
b/java/code/webapp/WEB-INF/struts-config.xml
index 47d0372..3b90c2e 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -2024,7 +2024,7 @@
parameter="dispatch"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
<set-property property="acls"
value="user_role(channel_admin)"/>
- <forward name="default"
path="/errata/manage/PackagePush.do" redirect="true"/>
+ <forward name="default"
path="/errata/manage/PackagePush.do"/>
<forward name="defaultWithoutRedirect"
path="/errata/manage/PackagePush.do" />
</action>
@@ -2137,7 +2137,7 @@
parameter="dispatch"
className="com.redhat.rhn.frontend.struts.RhnActionMapping">
<set-property property="acls"
value="user_role(channel_admin)"/>
- <forward name="default"
path="/errata/manage/AddPackagePackagePush.do" redirect="true"/>
+ <forward name="default"
path="/errata/manage/AddPackagePackagePush.do"/>
<forward name="defaultWithoutRedirect"
path="/errata/manage/AddPackagePackagePush.do" />
</action>
Show replies by date