luci-base: fix handling of monitor ifaces

[project/luci.git] / modules / luci-base / luasrc / model / network.lua

diff --git a/modules/luci-base/luasrc/model/network.lua b/modules/luci-base/luasrc/model/network.lua
index 576b2ef..1f0c5da 100644 (file)
--- a/modules/luci-base/luasrc/model/network.lua
+++ b/modules/luci-base/luasrc/model/network.lua
@@ -508,7 +508,7 @@ function get_interfaces(self)
                end)
 
        for iface in utl.kspairs(_interfaces) do
-               if not (seen[iface] or (_iface_ignore(iface) or _iface_virtual(iface) or _wifi_iface(iface)) then
+               if not (seen[iface] or _iface_ignore(iface) or _iface_virtual(iface) or _wifi_iface(iface)) then
                        nfs[iface] = interface(iface)
                end
        end
@@ -1140,10 +1140,7 @@ end
 
 function interface.shortname(self)
        if self.wif then
-               return "%s %q" %{
-                       self.wif:active_mode(),
-                       self.wif:active_ssid() or self.wif:active_bssid()
-               }
+               return self.wif:shortname()
        else
                return self.ifname
        end
@@ -1154,7 +1151,7 @@ function interface.get_i18n(self)
                return "%s: %s %q" %{
                        lng.translate("Wireless Network"),
                        self.wif:active_mode(),
-                       self.wif:active_ssid() or self.wif:active_bssid()
+                       self.wif:active_ssid() or self.wif:active_bssid() or self.wif:id()
                }
        else
                return "%s: %q" %{ self:get_type_i18n(), self:name() }
@@ -1593,7 +1590,7 @@ end
 function wifinet.shortname(self)
        return "%s %q" %{
                lng.translate(self:active_mode()),
-               self:active_ssid() or self:active_bssid()
+               self:active_ssid() or self:active_bssid() or self:id()
        }
 end
 
@@ -1601,7 +1598,7 @@ function wifinet.get_i18n(self)
        return "%s: %s %q (%s)" %{
                lng.translate("Wireless Network"),
                lng.translate(self:active_mode()),
-               self:active_ssid() or self:active_bssid(),
+               self:active_ssid() or self:active_bssid() or self:id(),
                self:ifname()
        }
 end