diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2019-09-18 07:33:25 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2019-09-18 07:33:25 +0200 |
| commit | 15cc74c6b444d22ccfc4384465424edd6d3a718e (patch) | |
| tree | 98614c0f3499846728723caa81de5f135e7a74f4 /modules/luci-mod-network | |
| parent | 10880b565f3050e1808333f3246bc791d35f69dd (diff) | |
luci-mod-network: interfaces.js: derive status from layer 3 device
Align the status column device selection logic with the approach used for
rendering the interface status boxes; first try to obtain the active
layer3 device as reported by ubus, only then fall back to the protocol
specific device hint which might or might not point to an existing device.
Fixes: #3076
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'modules/luci-mod-network')
| -rw-r--r-- | modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js index c79deea27..624718dd8 100644 --- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js +++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js @@ -65,7 +65,7 @@ function render_status(node, ifc, with_device) { ipaddrs = changecount ? [] : ifc.getIPAddrs(), ip6addrs = changecount ? [] : ifc.getIP6Addrs(), errors = ifc.getErrors(), - maindev = ifc.getDevice(), + maindev = ifc.getL3Device() || ifc.getDevice(), macaddr = maindev ? maindev.getMAC() : null; return L.itemlist(node, [ |