From 0113171c649787d6f757076402002a3b279e0708 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 19 Sep 2019 15:48:27 +0200 Subject: [PATCH] luci-mod-network: wireless.js: fix disabled state on disabled radio Signed-off-by: Jo-Philipp Wich --- .../htdocs/luci-static/resources/view/network/wireless.js | 5 +++-- 1 file changed, 3 insertions(+), 2 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 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', { -- 2.25.1