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

luci-base: firewall.js: manage zomne networks as list

Browse source 
Fixes: #4827
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2021-03-01 08:54:06 +01:00
parent 79d9449bbd
commit 49ecaf6090
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
modules/luci-base/htdocs/luci-static/resources/firewall.js
View file

@ -92,7 +92,6 @@ Firewall = L.Class.extend({
z = uci.add('firewall', 'zone'); z = uci.add('firewall', 'zone');
uci.set('firewall', z, 'name', name); uci.set('firewall', z, 'name', name);
uci.set('firewall', z, 'network', ' ');
uci.set('firewall', z, 'input', d.getInput() || 'DROP'); uci.set('firewall', z, 'input', d.getInput() || 'DROP');
uci.set('firewall', z, 'output', d.getOutput() || 'DROP'); uci.set('firewall', z, 'output', d.getOutput() || 'DROP');
uci.set('firewall', z, 'forward', d.getForward() || 'DROP'); uci.set('firewall', z, 'forward', d.getForward() || 'DROP');
@ -333,17 +332,17 @@ Zone = AbstractFirewallItem.extend({
return false; return false;
newNetworks.push(network); newNetworks.push(network);
this.set('network', newNetworks.join(' ')); this.set('network', newNetworks);
return true; return true;
}, },
deleteNetwork: function(network) { deleteNetwork: function(network) {
var oldNetworks = this.getNetworks(), var oldNetworks = this.getNetworks(),
newNetworks = oldNetworks.filter(function(net) { return net != network }); newNetworks = oldNetworks.filter(function(net) { return net != network });
if (newNetworks.length > 0) if (newNetworks.length > 0)
this.set('network', newNetworks.join(' ')); this.set('network', newNetworks);
else else
this.set('network', null); this.set('network', null);
@ -355,7 +354,7 @@ Zone = AbstractFirewallItem.extend({
}, },
clearNetworks: function() { clearNetworks: function() {
this.set('network', ' '); this.set('network', null);
}, },
getDevices: function() { getDevices: function() {