[vlma-devel] commit: Server#adapters now is a list. (Adrien Grand )

[git version control]

vlma | branch: master | Adrien Grand <jpountz at videolan.org> | Thu Aug  7 22:48:23 2008 +0200| [9d496bdf1dbd5d0a37c87e9824a37504dfa16b0f] | committer: Adrien Grand 

Server#adapters now is a list.

> http://git.videolan.org/gitweb.cgi/vlma.git/?a=commit;h=9d496bdf1dbd5d0a37c87e9824a37504dfa16b0f
---

 .../webapp/WEB-INF/jsp/server/serverview_right.jsp |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/vlma-webapp/src/main/webapp/WEB-INF/jsp/server/serverview_right.jsp b/vlma-webapp/src/main/webapp/WEB-INF/jsp/server/serverview_right.jsp
index ac555ed..b0d10e0 100644
--- a/vlma-webapp/src/main/webapp/WEB-INF/jsp/server/serverview_right.jsp
+++ b/vlma-webapp/src/main/webapp/WEB-INF/jsp/server/serverview_right.jsp
@@ -1,4 +1,3 @@
-
 <%@ include file="/WEB-INF/jsp/include.jsp" %>
 
 <h1>
@@ -13,18 +12,18 @@
     <li><fmt:message key="servers.view.adapters" />
         <table>
         <c:forEach items="${server.adapters}" var="adapter">
-            <tr><td><b><c:out value="${adapter.key}" /></b>
+            <tr><td><b><c:out value="${adapter.name}" /></b>
                 <c:choose>
-                    <c:when test="${adapter.value.type == 'DVB-S'}">
-                        <fmt:message key="servers.view.adapters.dvbs"><fmt:param value="${adapter.value.satellite.name}" /></fmt:message>
+                    <c:when test="${adapter.type == 'DVB-S'}">
+                        <fmt:message key="servers.view.adapters.dvbs"><fmt:param value="${adapter.satellite.name}" /></fmt:message>
                     </c:when>
-                    <c:when test="${adapter.value.type == 'DVB-T'}">
+                    <c:when test="${adapter.type == 'DVB-T'}">
                         <fmt:message key="servers.view.adapters.dvbt" />
                     </c:when>
                 </c:choose>
                 <c:url value="serveradapterremove.htm" var="adapterRemoveUrl">
                     <c:param name="server" value="${server.id}" />
-                    <c:param name="adapter" value="${adapter.key}" />
+                    <c:param name="adapter" value="${adapter.name}" />
                 </c:url></td>
                 <td><a href="${adapterRemoveUrl}"><img src="<c:url value="/img/delete.png" />" title="<fmt:message key="servers.view.adapters.remove" />" /></a></td>
             </tr>