luci-base: firewall.js: don't treat zone name as network fallback
authorJo-Philipp Wich <jo@mein.io>
Mon, 2 Mar 2020 09:08:32 +0000 (10:08 +0100)
committerJo-Philipp Wich <jo@mein.io>
Mon, 2 Mar 2020 09:10:27 +0000 (10:10 +0100)
Drop obsolete extra logic which treats the zone name as covered network
name in case the network list is unset. This behaviour applied to the
pre-fw3 uci firewall, but is not supported since fw3 anymore.

Ref: https://forum.openwrt.org/t/luci-zone-creation-bug/55921
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
modules/luci-base/htdocs/luci-static/resources/firewall.js

index 8f6be1813dc85c50a8791a0afe75f2c20fe52f75..eaab3bb9f0f19ca97930229234227998aeb74a08 100644 (file)
@@ -362,13 +362,13 @@ Zone = AbstractFirewallItem.extend({
                if (newNetworks.length > 0)
                        this.set('network', newNetworks.join(' '));
                else
-                       this.set('network', ' ');
+                       this.set('network', null);
 
                return (newNetworks.length < oldNetworks.length);
        },
 
        getNetworks: function() {
-               return L.toArray(this.get('network') || this.get('name'));
+               return L.toArray(this.get('network'));
        },
 
        clearNetworks: function() {