Index: lams_admin/web/serverlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/serverlist.jsp,v
diff -u -r1.6.12.3 -r1.6.12.4
--- lams_admin/web/serverlist.jsp	16 Jun 2016 03:10:20 -0000	1.6.12.3
+++ lams_admin/web/serverlist.jsp	28 Sep 2016 15:13:45 -0000	1.6.12.4
@@ -10,40 +10,38 @@
 		<th><fmt:message key="sysadmin.serverdesc" /></th>
 		<th><fmt:message key="sysadmin.prefix" /></th>
 		<th><fmt:message key="sysadmin.disabled" /></th>
-		<th><fmt:message key="sysadmin.organisation" /></th>
 		<th><fmt:message key="admin.actions"/></th>
 	</tr>
-	<c:forEach items="${servers}" var="serverOrgMap">
+	<c:forEach items="${servers}" var="server">
 	<tr>
-		<td><c:out value="${serverOrgMap.serverid}" /></td>
-		<td><c:out value="${serverOrgMap.serverkey}" /></td>
-		<td><c:out value="${serverOrgMap.servername}" /></td>
-		<td><c:out value="${serverOrgMap.serverdesc}" /></td>
-		<td><c:out value="${serverOrgMap.prefix}" /></td>
+		<td><c:out value="${server.serverid}" /></td>
+		<td><c:out value="${server.serverkey}" /></td>
+		<td><c:out value="${server.servername}" /></td>
+		<td><c:out value="${server.serverdesc}" /></td>
+		<td><c:out value="${server.prefix}" /></td>
 		<td>
 			<c:choose>
-			<c:when test="${serverOrgMap.disabled}" >
+			<c:when test="${server.disabled}" >
 				<fmt:message key="label.yes" />
 			</c:when>
 			<c:otherwise>
 				<fmt:message key="label.no" />
 			</c:otherwise>
 			</c:choose>
 		</td>
-		<td><c:out value="${serverOrgMap.organisation.name}" /></td>
 		<td>
-			<a id="edit_<c:out value='${serverOrgMap.serverid}'/>" href="servermaintain.do?method=edit&sid=<c:out value='${serverOrgMap.sid}' />"><fmt:message key="admin.edit" /></a>
+			<a id="edit_<c:out value='${server.serverid}'/>" href="servermaintain.do?method=edit&sid=<c:out value='${server.sid}' />"><fmt:message key="admin.edit" /></a>
 			&nbsp;
 			<c:choose>
-				<c:when test="${serverOrgMap.disabled}">
-					<a id="enable_<c:out value='${serverOrgMap.serverid}'/>" href="servermaintain.do?method=enable&sid=<c:out value='${serverOrgMap.sid}' />"><fmt:message key="admin.enable" /></a>
+				<c:when test="${server.disabled}">
+					<a id="enable_<c:out value='${server.serverid}'/>" href="servermaintain.do?method=enable&sid=<c:out value='${server.sid}' />"><fmt:message key="admin.enable" /></a>
 				</c:when>
 				<c:otherwise>
-					<a id="disable_<c:out value='${serverOrgMap.serverid}'/>" href="servermaintain.do?method=disable&sid=<c:out value='${serverOrgMap.sid}' />"><fmt:message key="admin.disable" /></a>
+					<a id="disable_<c:out value='${server.serverid}'/>" href="servermaintain.do?method=disable&sid=<c:out value='${server.sid}' />"><fmt:message key="admin.disable" /></a>
 				</c:otherwise>
 			</c:choose>
 			&nbsp;
-			<a id="delete_<c:out value='${serverOrgMap.serverid}'/>" href="servermaintain.do?method=delete&sid=<c:out value='${serverOrgMap.sid}' />"><fmt:message key="admin.delete" /></a>
+			<a id="delete_<c:out value='${server.serverid}'/>" href="servermaintain.do?method=delete&sid=<c:out value='${server.sid}' />"><fmt:message key="admin.delete" /></a>
 		</td>
 	</tr>
 	</c:forEach>