summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2020-03-02 10:11:44 +0100
committerJo-Philipp Wich <jo@mein.io>2020-03-02 10:11:44 +0100
commit663134cd2d6b9603d69f59665715586f77f4610a (patch)
tree84bc5f2db0a4382ce555c5a9a8a7c4a4b6d80e5e
parent4052436d825e1e78d1734ddd4d06d2291fbc5684 (diff)
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>
-rw-r--r--applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js5
1 files changed, 1 insertions, 4 deletions
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;