Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4561 from Ansuel/fix-enc-ap

Browse source 
Fix one display bug for ap join and #4524
This commit is contained in:
Jo-Philipp Wich 2020-11-01 17:23:17 +01:00 committed by GitHub
commit 78645e7efe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
View file

@ -1742,7 +1742,7 @@ return view.extend({
E('span', { 'style': s }, '%h'.format(network.formatWifiEncryption(res.encryption))), E('span', { 'style': s }, '%h'.format(network.formatWifiEncryption(res.encryption))),
E('div', { 'class': 'right' }, E('button', { E('div', { 'class': 'right' }, E('button', {
'class': 'cbi-button cbi-button-action important', 'class': 'cbi-button cbi-button-action important',
'click': L.bind(this.handleJoin, this, radioDev, res) 'click': ui.createHandlerFn(this, 'handleJoin', radioDev, res)
}, _('Join Network'))) }, _('Join Network')))
]); ]);
@ -1841,11 +1841,11 @@ return view.extend({
uci.set('wireless', section_id, 'bssid', bss.bssid); uci.set('wireless', section_id, 'bssid', bss.bssid);
} }
if (is_sae) { if (is_sae.length > 0) {
uci.set('wireless', section_id, 'encryption', 'sae'); uci.set('wireless', section_id, 'encryption', 'sae');
uci.set('wireless', section_id, 'key', passval); uci.set('wireless', section_id, 'key', passval);
} }
else if (is_psk) { else if (is_psk.length > 0) {
for (var i = enc.wpa.length - 1; i >= 0; i--) { for (var i = enc.wpa.length - 1; i >= 0; i--) {
if (enc.wpa[i] == 2) { if (enc.wpa[i] == 2) {
uci.set('wireless', section_id, 'encryption', 'psk2'); uci.set('wireless', section_id, 'encryption', 'psk2');
@ -1886,7 +1886,7 @@ return view.extend({
}; };
s.handleJoin = function(radioDev, bss, ev) { s.handleJoin = function(radioDev, bss, ev) {
this.handleScanAbort(ev); poll.remove(this.pollFn);
var m2 = new form.Map('wireless'), var m2 = new form.Map('wireless'),
s2 = m2.section(form.NamedSection, '_new_'), s2 = m2.section(form.NamedSection, '_new_'),