From: Jo-Philipp Wich <jo@mein.io>
Date: Mon, 2 Mar 2020 09:11:44 +0000 (+0100)
Subject: luci-app-firewall: don't treat zone name as network fallback
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a24f198c6f2707f034e0ad09133553191c72ad06;p=oweals%2Fluci.git

luci-app-firewall: 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>
(cherry picked from commit 663134cd2d6b9603d69f59665715586f77f4610a)
---

diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
index 89de8f46b..fe9ef75c5 100644
--- a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
+++ b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
@@ -146,7 +146,7 @@ return L.view.extend({
 		o.modalonly = true;
 		o.multiple = true;
 		o.cfgvalue = function(section_id) {
-			return uci.get('firewall', section_id, 'network') || uci.get('firewall', section_id, 'name');
+			return uci.get('firewall', section_id, 'network');
 		};
 		o.write = function(section_id, formvalue) {
 			var name = uci.get('firewall', section_id, 'name'),
@@ -171,9 +171,6 @@ return L.view.extend({
 						zone_networks[0].addNetwork(zone_networks[i].getName());
 			});
 		};
-		o.remove = function(section_id) {
-			return uci.set('firewall', section_id, 'network', ' ');
-		};
 
 		o = s.taboption('advanced', form.DummyValue, '_advancedinfo');
 		o.rawhtml = true;