java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 6 +- java/code/src/com/redhat/rhn/frontend/dto/NetworkDto.java | 22 ++++++++-- java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkDtoSerializer.java | 7 +++ java/code/webapp/WEB-INF/pages/systems/duplicate/duplicateIPList.jsp | 12 +++++ 4 files changed, 40 insertions(+), 7 deletions(-)
New commits: commit 0ab574b01ea7adfd2ad54e9d7e4e57d1ce0c79b9 Author: Partha Aji paji@redhat.com Date: Tue May 4 13:14:00 2010 -0400
Added some magic to show the system names and url instead of ids in the dups page
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml index 17d4725..143f3c0 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml @@ -1587,7 +1587,7 @@ DELETE FROM rhnSatelliteChannelFamily WHERE server_id = :sid
<mode name="duplicate_system_ids_ip" class="com.redhat.rhn.frontend.dto.NetworkDto"> <query params="uid"> - SELECT distinct S.id as id, NI.ip_addr as key, si.checkin as last_checkin + SELECT distinct S.id as id, S.name as name, NI.ip_addr as key, si.checkin as last_checkin from rhnServer S inner join rhnUserServerPerms USP on S.id = USP.server_id inner join rhnServerNetInterface NI on NI.server_id = S.id inner join @@ -1606,7 +1606,7 @@ DELETE FROM rhnSatelliteChannelFamily WHERE server_id = :sid
<mode name="duplicate_system_ids_mac" class="com.redhat.rhn.frontend.dto.NetworkDto"> <query params="uid"> - SELECT distinct S.id as id, NI.hw_addr as key, si.checkin as last_checkin + SELECT distinct S.id as id, S.name as name, NI.hw_addr as key, si.checkin as last_checkin from rhnServer S inner join rhnUserServerPerms USP on S.id = USP.server_id inner join rhnServerNetInterface NI on NI.server_id = S.id inner join @@ -1624,7 +1624,7 @@ DELETE FROM rhnSatelliteChannelFamily WHERE server_id = :sid
<mode name="duplicate_system_ids_hostname" class="com.redhat.rhn.frontend.dto.NetworkDto"> <query params="uid"> - SELECT distinct S.id as id, NI.hostname as key, si.checkin as last_checkin + SELECT distinct S.id as id, S.name as name, NI.hostname as key, si.checkin as last_checkin from rhnServer S inner join rhnUserServerPerms USP on S.id = USP.server_id inner join rhnServerNetwork NI on NI.server_id = S.id inner join diff --git a/java/code/src/com/redhat/rhn/frontend/dto/NetworkDto.java b/java/code/src/com/redhat/rhn/frontend/dto/NetworkDto.java index 511d32a..ab84260 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/NetworkDto.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/NetworkDto.java @@ -25,8 +25,8 @@ import java.util.Date; * @version $Rev$ */ public class NetworkDto implements Identifiable { - - + + private String name; private Long systemId; private String key; private Date lastCheckin; @@ -83,7 +83,23 @@ public class NetworkDto implements Identifiable { public void setId(Long systemIdIn) { this.systemId = systemIdIn; } - + + /** + * @return Returns the name. + */ + public String getName() { + return name; + } + + + /** + * @param nameIn The name to set. + */ + public void setName(String nameIn) { + name = nameIn; + } + + /** * {@inheritDoc} */ diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkDtoSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkDtoSerializer.java index 48c90ab..52cede5 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkDtoSerializer.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkDtoSerializer.java @@ -17,6 +17,8 @@ package com.redhat.rhn.frontend.xmlrpc.serializer; import com.redhat.rhn.frontend.dto.NetworkDto; import com.redhat.rhn.frontend.xmlrpc.serializer.util.SerializerHelper;
+import org.apache.commons.lang.StringUtils; + import java.io.IOException; import java.io.Writer;
@@ -52,6 +54,11 @@ public class NetworkDtoSerializer implements XmlRpcCustomSerializer { NetworkDto net = (NetworkDto)value; SerializerHelper helper = new SerializerHelper(builtInSerializer); helper.add("systemId", net.getId()); + String name = net.getName(); + if (StringUtils.isBlank(name)) { + name = "unknown"; + } + helper.add("systemName", name); helper.add("last_checkin", net.getLastCheckin()); helper.writeTo(output); } diff --git a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicateIPList.jsp b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicateIPList.jsp index 859f748..63c48dc 100644 --- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicateIPList.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicateIPList.jsp @@ -48,7 +48,17 @@ <rl:column headerkey="systemlist.jsp.system" filterattr="key" filtermessage="row.ip"> <rl:expandable rendericon="true">${current.key} <em>(<bean:message key="manysystems.message" arg0="${rl:countChildren(current)}"/>)</em> </rl:expandable> - <rl:non-expandable rendericon="true">${current.id}</rl:non-expandable> + <rl:non-expandable rendericon="true"> + <c:out value="<a href="/rhn/systems/details/Overview.do?sid=${current.id}">" escapeXml="false" /> + <c:choose> + <c:when test="${empty current.name}"> + <bean:message key="sdc.details.overview.unknown"/> + </c:when> + <c:otherwise> + <c:out value="${current.name}</a>" escapeXml="false" /> + </c:otherwise> + </c:choose> + </rl:non-expandable> </rl:column> <rl:column headerkey="systemlist.jsp.last_checked_in" styleclass="last-column">
spacewalk-commits@lists.fedorahosted.org