From: Jo-Philipp Wich <jo@mein.io>
Date: Mon, 30 Sep 2019 10:40:12 +0000 (+0200)
Subject: luci-mod-network: display the mesh ID in wireless overview if applicable
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=17800040f28e19e5d6d491d27a7891655eb0ed13;p=project%2Fluci.git

luci-mod-network: display the mesh ID in wireless overview if applicable

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

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,