Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-app-firewall: don't treat zone name as network fallback

Browse source 
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 663134cd2d)
This commit is contained in:
Jo-Philipp Wich 2020-03-02 10:11:44 +01:00
parent b01cf69536
commit a24f198c6f
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
View file

@ -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;