summaryrefslogtreecommitdiffhomepage
path: root/modules
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2020-05-24 17:32:14 +0200
committerJo-Philipp Wich <jo@mein.io>2020-05-24 17:33:26 +0200
commitf6f4005d0baf70f04752747822cda9f1248c47ca (patch)
treea5a3c6e826b76796aa4bd2f4964fac38c564e16a /modules
parent4d70990ef649a07d0f5d9e49ec1e465adfef8c64 (diff)
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 <jo@mein.io>
Diffstat (limited to 'modules')
-rw-r--r--modules/luci-base/htdocs/luci-static/resources/firewall.js5
1 files changed, 1 insertions, 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;
}