summaryrefslogtreecommitdiffhomepage
path: root/modules
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2020-03-02 10:08:32 +0100
committerJo-Philipp Wich <jo@mein.io>2020-03-02 10:10:27 +0100
commit4052436d825e1e78d1734ddd4d06d2291fbc5684 (patch)
tree04e0458f57a0991165148f62bcc43fe494e29c80 /modules
parent1c547d36b545e79838acca021767071ae95ca5c9 (diff)
luci-base: firewall.js: don't treat zone name as network fallback
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>
Diffstat (limited to 'modules')
-rw-r--r--modules/luci-base/htdocs/luci-static/resources/firewall.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/luci-base/htdocs/luci-static/resources/firewall.js b/modules/luci-base/htdocs/luci-static/resources/firewall.js
index 8f6be1813d..eaab3bb9f0 100644
--- a/modules/luci-base/htdocs/luci-static/resources/firewall.js
+++ b/modules/luci-base/htdocs/luci-static/resources/firewall.js
@@ -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() {