diff options
| author | Florian Eckert <fe@dev.tdt.de> | 2019-04-25 13:28:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-25 13:28:56 +0200 |
| commit | 35ace20b25fd7fd4410485ee82283e6d41a99bc7 (patch) | |
| tree | 8890806201ce45f06b87ff83617e9b7c209b671f | |
| parent | 3ffdf4160fad723b87cb0df6e3a89b3e164067ee (diff) | |
| parent | 2b94060c605335c48a44afaa47b7e6ba3b243354 (diff) | |
Merge pull request #2119 from TDT-AG/pr/20180830-fix-iface-status-page
luci-mod-admin-full: add hint to overview page
3 files changed, 12 insertions, 0 deletions
diff --git a/modules/luci-base/luasrc/model/network.lua b/modules/luci-base/luasrc/model/network.lua index 49e1657aa..dec25a5d0 100644 --- a/modules/luci-base/luasrc/model/network.lua +++ b/modules/luci-base/luasrc/model/network.lua @@ -1159,6 +1159,16 @@ function protocol.is_dynamic(self) return (self:_ubus("dynamic") == true) end +function protocol.is_auto(self) + local auto = self:_get("auto") + + if auto == "0" then + return false + else + return true + end +end + function protocol.is_alias(self) local ifn, parent = nil, nil diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js index fe1ff19fe..bab23cc3c 100644 --- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js +++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js @@ -102,6 +102,7 @@ L.poll(5, L.url('admin/network/iface_status', networks.join(',')), null, _('IPv6'), ifc.ip6addrs ? ifc.ip6addrs[8] : null, _('IPv6'), ifc.ip6addrs ? ifc.ip6addrs[9] : null, _('IPv6-PD'), ifc.ip6prefix, + _('Information'), ifc.is_auto ? null : _('Not started on boot'), _('Error'), ifc.errors ? ifc.errors[0] : null, _('Error'), ifc.errors ? ifc.errors[1] : null, _('Error'), ifc.errors ? ifc.errors[2] : null, diff --git a/modules/luci-mod-network/luasrc/controller/admin/network.lua b/modules/luci-mod-network/luasrc/controller/admin/network.lua index 1da5eac46..2312dcf6e 100644 --- a/modules/luci-mod-network/luasrc/controller/admin/network.lua +++ b/modules/luci-mod-network/luasrc/controller/admin/network.lua @@ -212,6 +212,7 @@ function iface_status(ifaces) is_up = net:is_up() and device:is_up(), is_alias = net:is_alias(), is_dynamic = net:is_dynamic(), + is_auto = net:is_auto(), rx_bytes = device:rx_bytes(), tx_bytes = device:tx_bytes(), rx_packets = device:rx_packets(), |