luci-mod-network: resort zonePromise order
authorChen Minqiang <ptpt52@gmail.com>
Mon, 23 Sep 2019 17:11:16 +0000 (01:11 +0800)
committerJo-Philipp Wich <jo@mein.io>
Tue, 24 Sep 2019 05:08:49 +0000 (07:08 +0200)
This fix #3103

Signed-off-by: Chen Minqiang <ptpt52@gmail.com>
modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js

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