summaryrefslogtreecommitdiffhomepage
path: root/modules/luci-mod-network/htdocs/luci-static/resources/view
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2019-09-30 12:40:12 +0200
committerJo-Philipp Wich <jo@mein.io>2019-09-30 12:40:12 +0200
commit17800040f28e19e5d6d491d27a7891655eb0ed13 (patch)
tree5452d3d908601344f2faeff6e19a4d830305a009 /modules/luci-mod-network/htdocs/luci-static/resources/view
parent948ca3712fe5adf98933106328b089fbed4bb61a (diff)
luci-mod-network: display the mesh ID in wireless overview if applicable
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'modules/luci-mod-network/htdocs/luci-static/resources/view')
-rw-r--r--modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js3
1 files changed, 2 insertions, 1 deletions
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,