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

luci-mod-network: resort zonePromise order

Browse source 
This fix #3103

Signed-off-by: Chen Minqiang <ptpt52@gmail.com>
This commit is contained in:
Chen Minqiang 2019-09-24 01:11:16 +08:00 committed by Jo-Philipp Wich
parent f3ff641d8e
commit 2f92a29628
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1769,14 +1769,14 @@ return L.view.extend({
uci.set('wireless', section_id, 'key1', passval); uci.set('wireless', section_id, 'key1', passval);
} }
return network.addNetwork(nameval, { proto: 'dhcp' }).then(function(net) {
firewall.deleteNetwork(net.getName());
var zonePromise = zoneval var zonePromise = zoneval
? firewall.getZone(zoneval).then(function(zone) { return zone || firewall.addZone(zoneval) }) ? firewall.getZone(zoneval).then(function(zone) { return zone || firewall.addZone(zoneval) })
: Promise.resolve(); : Promise.resolve();
return zonePromise.then(function(zone) { return zonePromise.then(function(zone) {
return network.addNetwork(nameval, { proto: 'dhcp' }).then(function(net) {
firewall.deleteNetwork(net.getName());
if (zone) if (zone)
zone.addNetwork(net.getName()); zone.addNetwork(net.getName());
}); });