From 7fca170275a951c47f4ff0d1e5533bda4054cd1e Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 24 May 2020 17:32:14 +0200 Subject: [PATCH] luci-base: firewall.js: remove further zone network/name fallback logic Fixes: #4093 Fixes: 4052436d8 ("luci-base: firewall.js: don't treat zone name as network fallback") Signed-off-by: Jo-Philipp Wich (cherry picked from commit f6f4005d0baf70f04752747822cda9f1248c47ca) --- modules/luci-base/htdocs/luci-static/resources/firewall.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/modules/luci-base/htdocs/luci-static/resources/firewall.js b/modules/luci-base/htdocs/luci-static/resources/firewall.js index f7b731e6f..b1c7de435 100644 --- a/modules/luci-base/htdocs/luci-static/resources/firewall.js +++ b/modules/luci-base/htdocs/luci-static/resources/firewall.js @@ -140,7 +140,7 @@ Firewall = L.Class.extend({ var sections = uci.sections('firewall', 'zone'); for (var i = 0; i < sections.length; i++) - if (L.toArray(sections[i].network || sections[i].name).indexOf(network) != -1) + if (L.toArray(sections[i].network).indexOf(network) != -1) return new Zone(sections[i]['.name']); return null; @@ -202,9 +202,6 @@ Firewall = L.Class.extend({ if (sections[i].name != oldName) continue; - if (L.toArray(sections[i].network).length == 0) - uci.set('firewall', sections[i]['.name'], 'network', oldName); - uci.set('firewall', sections[i]['.name'], 'name', newName); found = true; } -- 2.25.1