From: Jo-Philipp Wich <jo@mein.io>
Date: Thu, 19 Sep 2019 13:48:27 +0000 (+0200)
Subject: luci-mod-network: wireless.js: fix disabled state on disabled radio
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0113171c649787d6f757076402002a3b279e0708;p=oweals%2Fluci.git

luci-mod-network: wireless.js: fix disabled state on disabled radio

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 efbc11403..e5213ff13 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
@@ -87,7 +87,7 @@ function render_network_status(radioNet) {
 	var mode = radioNet.getActiveMode(),
 	    bssid = radioNet.getActiveBSSID(),
 	    channel = radioNet.getChannel(),
-	    disabled = (radioNet.get('disabled') == '1'),
+	    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),
 	    changecount = count_changes(radioNet.getName()),
 	    status_text = null;
@@ -704,7 +704,8 @@ return L.view.extend({
 				];
 			}
 			else {
-				var isDisabled = (inst.get('disabled') == '1');
+				var isDisabled = (inst.get('disabled') == '1' ||
+					uci.get('wireless', inst.getWifiDeviceName(), 'disabled') == '1');
 
 				btns = [
 					E('button', {