java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDetailsAction.java |
11 ++++------
java/spacewalk-java.spec |
5 +++-
rel-eng/packages/spacewalk-java |
2 -
3 files changed, 10 insertions(+), 8 deletions(-)
New commits:
commit 754456c075055a240ef125c488eedc89714ea584
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Thu Feb 20 16:39:22 2014 +0100
Automatic commit of package [spacewalk-java] release [2.1.161-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 9ccb311..a24d2b9 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 2.1.160
+Version: 2.1.161
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -801,6 +801,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Feb 20 2014 Jan Dobes 2.1.161-1
+- fixing ISE in create repo form
+
* Thu Feb 20 2014 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.160-1
- Styling unstyled submit buttons.
- styling buttons. LocalizedSubmitTag can't access styleClass attribute. It is
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 6c79985..0915982 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.160-1 java/
+2.1.161-1 java/
commit 0ccfffbfd887775b70e783638699097d6efb1d68
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Thu Feb 20 15:04:31 2014 +0100
fixing ISE in create repo form
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDetailsAction.java
b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDetailsAction.java
index 2ddcd8f..d580f5f 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDetailsAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/repo/RepoDetailsAction.java
@@ -78,6 +78,7 @@ public class RepoDetailsAction extends RhnAction {
HttpServletResponse response) {
DynaActionForm form = (DynaActionForm) formIn;
RequestContext ctx = new RequestContext(request);
+ Map params = makeParamMap(request);
request.setAttribute(mapping.getParameter(), Boolean.TRUE);
@@ -97,9 +98,7 @@ public class RepoDetailsAction extends RhnAction {
if (!errors.isEmpty()) {
addErrors(request, errors);
setupPopup(ctx);
- return getStrutsDelegate().forwardParam(
- mapping.findForward(RhnHelper.DEFAULT_FORWARD),
"id",
- repo.getId().toString());
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
if (isCreateMode(request)) {
createSuccessMessage(request,
@@ -111,9 +110,9 @@ public class RepoDetailsAction extends RhnAction {
}
request.removeAttribute(CREATE_MODE);
setupRepo(request, form, repo);
- return getStrutsDelegate().forwardParam(
- mapping.findForward("success"), "id",
- repo.getId().toString());
+ params.put("id", repo.getId());
+ return getStrutsDelegate().forwardParams(
+ mapping.findForward("success"), params);
}
catch (ValidatorException ve) {
getStrutsDelegate().saveMessages(request, ve.getResult());