summaryrefslogtreecommitdiffhomepage
path: root/modules/luci-mod-network
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2019-09-19 15:48:27 +0200
committerJo-Philipp Wich <jo@mein.io>2019-09-19 15:48:27 +0200
commit0113171c649787d6f757076402002a3b279e0708 (patch)
tree977e000f727d9cd75abcb83c5855455800115686 /modules/luci-mod-network
parent0d9a77d8066867f34fa759a94e66f73dfd9b2d18 (diff)
luci-mod-network: wireless.js: fix disabled state on disabled radio
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'modules/luci-mod-network')
-rw-r--r--modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js5
1 files 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', {