BPI/luci
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci-mod-network: fix disabled state in wifi settings modal

Browse Source 
Also auto-enable the radio upon network join.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2019-11-01 12:32:17 +01:00
parent c360cdd1f0
commit b4861da886
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
View File

@ -743,7 +743,8 @@ return L.view.extend({
ss.tab('general', _('General Setup'));
ss.tab('advanced', _('Advanced Settings'));
var isDisabled = (radioNet.get('disabled') == '1');
var isDisabled = (radioNet.get('disabled') == '1' ||
uci.get('wireless', radioNet.getWifiDeviceName(), 'disabled') == 1);
o = ss.taboption('general', form.DummyValue, '_wifistat_modal', _('Status'));
o.cfgvalue = L.bind(function(radioNet) {
@ -1734,15 +1735,23 @@ return L.view.extend({
var section_id = null;
return this.map.save(function() {
if (replopt.formvalue('_new_') == '1') {
var sections = uci.sections('wireless', 'wifi-iface');
var wifi_sections = uci.sections('wireless', 'wifi-iface');
for (var i = 0; i < sections.length; i++)
if (sections[i].device == radioDev.getName())
uci.remove('wireless', sections[i]['.name']);
if (replopt.formvalue('_new_') == '1') {
for (var i = 0; i < wifi_sections.length; i++)
if (wifi_sections[i].device == radioDev.getName())
uci.remove('wireless', wifi_sections[i]['.name']);
}
section_id = next_free_sid(uci.sections('wifi-iface').length);
if (uci.get('wireless', radioDev.getName(), 'disabled') == '1') {
for (var i = 0; i < wifi_sections.length; i++)
if (wifi_sections[i].device == radioDev.getName())
uci.set('wireless', wifi_sections[i]['.name'], 'disabled', '1');
uci.unset('wireless', radioDev.getName(), 'disabled');
}
section_id = next_free_sid(wifi_sections.length);
uci.add('wireless', 'wifi-iface', section_id);
uci.set('wireless', section_id, 'device', radioDev.getName());