summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannu Nyman <hannu.nyman@iki.fi>2020-05-14 10:19:34 +0300
committerGitHub <noreply@github.com>2020-05-14 10:19:34 +0300
commit733734ab203db3e808e3ffae761aae770310d624 (patch)
treebff421d35ed87ef107cf52c13925346b99af13a0
parent6d9a0488d65413743c7bc1d0bff5fef6b9713b49 (diff)
parent3e26f34ad899f13ffbf379db0a4a682c951368ad (diff)
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
-rw-r--r--modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm2
1 files changed, 1 insertions, 1 deletions
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 29a03f2554..442495d80b 100644
--- 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,