From b01cf695365bbb86f30a211c19b2eda543f4c0ad Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 2 Mar 2020 10:08:32 +0100 Subject: [PATCH] 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 (cherry picked from commit 4052436d825e1e78d1734ddd4d06d2291fbc5684) --- modules/luci-base/htdocs/luci-static/resources/firewall.js | 4 ++-- 1 file 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 8f6be1813..eaab3bb9f 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() { -- 2.25.1