luci-base: fix handling of monitor ifaces
authorJo-Philipp Wich <jo@mein.io>
Thu, 4 Aug 2016 09:40:34 +0000 (11:40 +0200)
committerJo-Philipp Wich <jo@mein.io>
Thu, 4 Aug 2016 09:45:30 +0000 (11:45 +0200)
Wireless monitor interfaces usually have no SSID set in their config and
various network model utility functions did not handle this case properly,
mainly while trying to incorperate the SSID string into various description
labels.

Fall back to the internal network id (radioX.networkY) in cases where neither
the SSID nor the BSSID are available.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
modules/luci-base/luasrc/model/network.lua

index 9cd7c87c0c2904c42698ad81fa426b75b6bf1031..1f0c5da73a227b81faffbc12339e7566c265da92 100644 (file)
@@ -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