java/code/src/com/redhat/rhn/frontend/action/channel/manage/DistChannelMapEditAction.java
| 11 ++++++++++
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
| 3 ++
java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp
| 2 -
java/spacewalk-java.spec
| 6 ++++-
rel-eng/packages/spacewalk-java
| 2 -
5 files changed, 21 insertions(+), 3 deletions(-)
New commits:
commit 25712cdd79b840ae6a2d0cb80ed0ab254d984169
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Tue Jun 11 18:53:13 2013 +0200
Automatic commit of package [spacewalk-java] release [1.10.92-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index b694e85..126b101 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: 1.10.91
+Version: 1.10.92
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -751,6 +751,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Jun 11 2013 Jan Dobes 1.10.92-1
+- 970125 - adding unique value check
+- 971828 - fixing wrong escaping of utf-8 strings
+
* Tue Jun 11 2013 Jan Dobes 1.10.91-1
- 913032 - we now remember sent errata email notifications to prevent multiple
messages
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index b9ecb1f..b84f363 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.91-1 java/
+1.10.92-1 java/
commit 0116589c7658c34de44ca019a7c40af3c068b378
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Tue Jun 11 18:23:41 2013 +0200
970125 - adding unique value check
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DistChannelMapEditAction.java
b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DistChannelMapEditAction.java
index 941ce7a..fc866cc 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DistChannelMapEditAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/DistChannelMapEditAction.java
@@ -112,6 +112,17 @@ public class DistChannelMapEditAction extends RhnAction {
if (dcmId == null || dcm == null || dcm.getOrg() == null) {
ChannelArch cha = ChannelFactory.lookupArchByLabel(
(String) form.get(CHANNEL_ARCH));
+
+ // Combination org, release, architecture has to be unique.
+ dcm = ChannelFactory.lookupDistChannelMapByOrgReleaseArch(
+ user.getOrg(), (String) form.get(RELEASE), cha);
+ if (dcm != null) {
+ createErrorMessage(request,
+ "distchannelmap.jsp.create.default.message",
+ (String) form.get(OS));
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
+ }
+
DistChannelMap newDcm = new DistChannelMap(
user.getOrg(), (String) form.get(OS), (String)
form.get(RELEASE),
cha, channel);
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index a459254..300f836 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -8116,6 +8116,9 @@ Please note that some manual configuration of these scripts may
still be require
<trans-unit id="distchannelmap.jsp.create.message">
<source>New Distribution Channel Mapping '{0}' created
successfully.</source>
</trans-unit>
+ <trans-unit id="distchannelmap.jsp.create.default.message">
+ <source>New Distribution Channel Mapping '{0}' cannot be created.
Release - Architecture combination already exists.</source>
+ </trans-unit>
<trans-unit id="distchannelmap.jsp.update.message">
<source>Distribution Channel Mapping '{0}' updated
successfully.</source>
</trans-unit>
commit df7ef7cedff6651c3c5f3ba3ca456a599fdd1e3d
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Tue Jun 11 14:36:18 2013 +0200
971828 - fixing wrong escaping of utf-8 strings
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp
b/java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp
index 62318d9..8621e3d 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/org_users.jsp
@@ -78,7 +78,7 @@
sortable="false"
headerkey="realname.displayname"
attr="userLastName">
- <c:out value="${current.userDisplayName}" />
+ <c:out value="${current.userDisplayName}" escapeXml="false"
/>
</rl:column>
<rl:column bound="false"
sortable="false"