From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 8 Mar 2010 00:53:12 +0000 (+0000)
Subject: luci-0.9: merge r5741
X-Git-Tag: 0.9.0~69
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7ae301e92c513026e4931bbbe5bf9bc0117e481a;p=oweals%2Fluci.git

luci-0.9: merge r5741
---

diff --git a/modules/admin-full/luasrc/view/admin_status/routes.htm b/modules/admin-full/luasrc/view/admin_status/routes.htm
index cd62b80e5..62c02e8f9 100644
--- a/modules/admin-full/luasrc/view/admin_status/routes.htm
+++ b/modules/admin-full/luasrc/view/admin_status/routes.htm
@@ -68,15 +68,10 @@ $Id$
 				</tr>
 				<% luci.sys.net.routes6(function(rt) %>
 				<tr class="cbi-section-table-row cbi-rowstyle-<%=(style and 1 or 2)%>">
-					<td class="cbi-value-field"><%=luci.tools.webadmin.iface_get_network(rt.device) or rt.device%></td>
+					<td class="cbi-value-field"><%=luci.tools.webadmin.iface_get_network(rt.device) or '(' .. rt.device .. ')'%></td>
 					<td class="cbi-value-field"><%=rt.dest:string()%></td>
 					<td class="cbi-value-field"><%=rt.source:string()%></td>
-					<td class="cbi-value-field"><%- 
-						local metr   = rt.metric
-						local lower  = bit.band(metr, 0xffff)
-						local higher = bit.rshift(bit.band(metr, 0xffff0000), 16)
-						write(string.format("%04X%04X", higher, lower))
-					-%></td>
+					<td class="cbi-value-field"><%=rt.metric_raw:upper()%></td>
 				</tr>
 				<% style = not style; end) %>
 			</table>