diff options
| -rw-r--r-- | modules/luci-base/htdocs/luci-static/resources/network.js | 10 | ||||
| -rw-r--r-- | modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js | 3 |
2 files changed, 12 insertions, 1 deletions
diff --git a/modules/luci-base/htdocs/luci-static/resources/network.js b/modules/luci-base/htdocs/luci-static/resources/network.js index a85e2414b6..a9e65dac51 100644 --- a/modules/luci-base/htdocs/luci-static/resources/network.js +++ b/modules/luci-base/htdocs/luci-static/resources/network.js @@ -2121,9 +2121,19 @@ WifiNetwork = L.Class.extend({ }, getSSID: function() { + if (this.getMode() == 'mesh') + return null; + return this.ubus('net', 'config', 'ssid') || this.get('ssid'); }, + getMeshID: function() { + if (this.getMode() != 'mesh') + return null; + + return this.ubus('net', 'config', 'mesh_id') || this.get('mesh_id'); + }, + getBSSID: function() { return this.ubus('net', 'config', 'bssid') || this.get('bssid'); }, diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js index f02b254645..c9f5957f8e 100644 --- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js +++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js @@ -89,6 +89,7 @@ function render_network_status(radioNet) { channel = radioNet.getChannel(), disabled = (radioNet.get('disabled') == '1' || uci.get('wireless', radioNet.getWifiDeviceName(), 'disabled') == '1'), is_assoc = (bssid && bssid != '00:00:00:00:00:00' && channel && mode != 'Unknown' && !disabled), + is_mesh = (radioNet.getMode() == 'mesh'), changecount = count_changes(radioNet.getName()), status_text = null; @@ -101,7 +102,7 @@ function render_network_status(radioNet) { status_text = E('em', disabled ? _('Wireless is disabled') : _('Wireless is not associated')); return L.itemlist(E('div'), [ - _('SSID'), radioNet.getSSID() || '?', + is_mesh ? _('Mesh ID') : _('SSID'), (is_mesh ? radioNet.getMeshID() : radioNet.getSSID()) || '?', _('Mode'), mode, _('BSSID'), (!changecount && is_assoc) ? bssid : null, _('Encryption'), (!changecount && is_assoc) ? radioNet.getActiveEncryption() || _('None') : null, |