Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-mod-admin-full: allow empty mac in interface status

Browse source 
Also adjust for changed IP address format emitted by iface_status call.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
This commit is contained in:
Jo-Philipp Wich 2015-11-17 17:42:22 +01:00
parent 152ba9ab22
commit 20fdac1ac4
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/luci-mod-admin-full/luasrc/view/admin_network/iface_overview.htm
View file

@ -135,7 +135,7 @@
html += String.format('<strong><%:Uptime%>:</strong> %t<br />', ifc.uptime); html += String.format('<strong><%:Uptime%>:</strong> %t<br />', ifc.uptime);
} }
if (ifc.type != 'tunnel') if (ifc.macaddr)
{ {
html += String.format('<strong><%:MAC-Address%>:</strong> %s<br />', ifc.macaddr); html += String.format('<strong><%:MAC-Address%>:</strong> %s<br />', ifc.macaddr);
} }
@ -153,10 +153,9 @@
for (var i = 0; i < ifc.ipaddrs.length; i++) for (var i = 0; i < ifc.ipaddrs.length; i++)
html += String.format( html += String.format(
'%s%s/%d', '%s%s',
i ? ', ' : '', i ? ', ' : '',
ifc.ipaddrs[i].addr, ifc.ipaddrs[i]
ifc.ipaddrs[i].prefix
); );
html += '<br />'; html += '<br />';
@ -168,10 +167,9 @@
for (var i = 0; i < ifc.ip6addrs.length; i++) for (var i = 0; i < ifc.ip6addrs.length; i++)
html += String.format( html += String.format(
'%s%s/%d', '%s%s',
i ? ', ' : '', i ? ', ' : '',
ifc.ip6addrs[i].addr.toUpperCase(), ifc.ip6addrs[i].toUpperCase()
ifc.ip6addrs[i].prefix
); );
html += '<br />'; html += '<br />';
@ -250,7 +248,7 @@
<input type="button" class="cbi-button cbi-button-reload" style="width:100px" onclick="iface_shutdown('<%=net[1]%>', true)" title="<%:Reconnect this interface%>" value="<%:Connect%>" /> <input type="button" class="cbi-button cbi-button-reload" style="width:100px" onclick="iface_shutdown('<%=net[1]%>', true)" title="<%:Reconnect this interface%>" value="<%:Connect%>" />
<input type="button" class="cbi-button cbi-button-reset" style="width:100px" onclick="iface_shutdown('<%=net[1]%>', false)" title="<%:Shutdown this interface%>" value="<%:Stop%>" /> <input type="button" class="cbi-button cbi-button-reset" style="width:100px" onclick="iface_shutdown('<%=net[1]%>', false)" title="<%:Shutdown this interface%>" value="<%:Stop%>" />
<input type="button" class="cbi-button cbi-button-edit" style="width:100px" onclick="location.href='<%=url("admin/network/network", net[1])%>'" title="<%:Edit this interface%>" value="<%:Edit%>" id="<%=net[1]%>-ifc-edit" /> <input type="button" class="cbi-button cbi-button-edit" style="width:100px" onclick="location.href='<%=url("admin/network/network", net[1])%>'" title="<%:Edit this interface%>" value="<%:Edit%>" id="<%=net[1]%>-ifc-edit" />
<input type="button" class="cbi-button cbi-button-remove" style="width:100px" onclick="iface_delete('<%=net[1]%>')" value="<%:Delete%>" /> <input type="submit" class="cbi-button cbi-button-remove" style="width:100px" onclick="iface_delete('<%=net[1]%>')" value="<%:Delete%>" />
</td> </td>
</tr> </tr>
<% end %> <% end %>

7
modules/luci-mod-admin-full/luasrc/view/admin_network/iface_status.htm
View file

@ -25,7 +25,7 @@
html += String.format('<strong><%:Uptime%>:</strong> %t<br />', ifc.uptime); html += String.format('<strong><%:Uptime%>:</strong> %t<br />', ifc.uptime);
} }
if (ifc.type != 'tunnel') if (ifc.macaddr)
{ {
html += String.format('<strong><%:MAC-Address%>:</strong> %s<br />', ifc.macaddr); html += String.format('<strong><%:MAC-Address%>:</strong> %s<br />', ifc.macaddr);
} }
@ -43,10 +43,9 @@
for (var i = 0; i < ifc.ipaddrs.length; i++) for (var i = 0; i < ifc.ipaddrs.length; i++)
html += String.format( html += String.format(
'%s%s/%d', '%s%s',
i ? ', ' : '', i ? ', ' : '',
ifc.ipaddrs[i].addr, ifc.ipaddrs[i]
ifc.ipaddrs[i].prefix
); );
html += '<br />'; html += '<br />';