java/code/src/com/redhat/rhn/frontend/dto/SystemSearchResult.java | 9 ++++++++-
java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp | 7 +++++++
2 files changed, 15 insertions(+), 1 deletion(-)
New commits:
commit f7eefed0ea337a932bc9d8ce88950026b4a2962e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue May 3 12:10:16 2011 +0200
683200 - encode hostname to IDN in systems/Search.do page
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/SystemSearchResult.java
b/java/code/src/com/redhat/rhn/frontend/dto/SystemSearchResult.java
index f9fd069..c0e8244 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/SystemSearchResult.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/SystemSearchResult.java
@@ -20,7 +20,7 @@ import org.apache.log4j.Logger;
import java.lang.reflect.InvocationTargetException;
import java.util.Calendar;
-
+import java.net.IDN;
/**
* SystemSearchResult
@@ -162,6 +162,13 @@ public class SystemSearchResult extends SystemOverview {
}
/**
+ * @return the hostname in IDN encoding
+ */
+ public String getDecodedHostname() {
+ return (hostname == null) ? null : IDN.toUnicode(hostname);
+ }
+
+ /**
* @return the description
*/
public String getDescription() {
diff --git a/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
b/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
index f8cc9d6..2e1787e 100644
--- a/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/systemsearch.jsp
@@ -160,6 +160,13 @@
</rhn:highlight>
</rl:column>
</c:when>
+ <c:when test="${view_mode ==
'systemsearch_hostname'}">
+ <rl:column bound="false"
headerkey="${view_mode}">
+ <rhn:highlight tag="strong"
text="${search_string}">
+ ${current.decodedHostname}
+ </rhn:highlight>
+ </rl:column>
+ </c:when>
<c:otherwise>
<rl:column bound="false"
headerkey="${view_mode}">
<rhn:highlight tag="strong"
text="${search_string}">
Show replies by date