Merge pull request #3953 from sunnyqeen/openwrt-18.06

 luci-mod-admin-full: fixed ipv6 address display in the overview page of luci 18.06

diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm b/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
index 29a03f2554527aa408a63d10f989a493e5d01185..442495d80be826bf2b30ffb347d00398d054b9bf 100644 (file)
--- a/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
@@ -210,7 +210,7 @@
                                        '<%:MAC-Address%>', (ifc6 && ifc6.ether) ? ifc6.mac : null)) ],
                                '<%:Protocol%>', ifc6.i18n ? (ifc6.i18n + (ifc6.proto === 'dhcp' && ifc6.ip6prefix ? '-PD' : '')) : E('em', '<%:Not connected%>'),
                                '<%:Prefix Delegated%>', ifc6.ip6prefix,
-                               '<%:Address%>', (ifc6.ip6prefix) ? (ifc6.ip6addr || null) : (ifc6.ipaddr || '::'),
+                               '<%:Address%>', (ifc6.ip6prefix) ? (ifc6.ip6addr || null) : (ifc6.ip6addr || '::'),
                                '<%:Gateway%>', (ifc6.gw6addr) ? ifc6.gw6addr : '::',
                                '<%:DNS%> 1', (ifc6.dns) ? ifc6.dns[0] : null,
                                '<%:DNS%> 2', (ifc6.dns) ? ifc6.dns[1] : null,