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

luci-app-firewall: fix variable clash leading to incorrect family display

Browse source 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2020-01-20 18:57:47 +01:00
parent 8b1d831935
commit 9fd7e9fc23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js
View file

@ -29,7 +29,7 @@ function rule_proto_txt(s, ctHelpers) {
} : null; } : null;
m = String(uci.get('firewall', s, 'mark')).match(/^(!\s*)?(0x[0-9a-f]{1,8}|[0-9]{1,10})(?:\/(0x[0-9a-f]{1,8}|[0-9]{1,10}))?$/i); m = String(uci.get('firewall', s, 'mark')).match(/^(!\s*)?(0x[0-9a-f]{1,8}|[0-9]{1,10})(?:\/(0x[0-9a-f]{1,8}|[0-9]{1,10}))?$/i);
var f = m ? { var w = m ? {
val: m[0].toUpperCase().replace(/X/g, 'x'), val: m[0].toUpperCase().replace(/X/g, 'x'),
inv: m[1], inv: m[1],
num: '0x%02X'.format(+m[2]), num: '0x%02X'.format(+m[2]),
@ -51,7 +51,7 @@ function rule_proto_txt(s, ctHelpers) {
dest: uci.get('firewall', s, 'dest'), dest: uci.get('firewall', s, 'dest'),
proto: proto, proto: proto,
helper: h, helper: h,
mark: f, mark: w,
dscp: d dscp: d
}); });
} }