From 9fd7e9fc23647fe7adfe84d1bc3b406ab52186e7 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 20 Jan 2020 18:57:47 +0100 Subject: luci-app-firewall: fix variable clash leading to incorrect family display Signed-off-by: Jo-Philipp Wich --- .../htdocs/luci-static/resources/view/firewall/rules.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'applications/luci-app-firewall/htdocs') diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js index b68f428d9..ada05f24c 100644 --- a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js +++ b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js @@ -29,7 +29,7 @@ function rule_proto_txt(s, ctHelpers) { } : 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); - var f = m ? { + var w = m ? { val: m[0].toUpperCase().replace(/X/g, 'x'), inv: m[1], num: '0x%02X'.format(+m[2]), @@ -51,7 +51,7 @@ function rule_proto_txt(s, ctHelpers) { dest: uci.get('firewall', s, 'dest'), proto: proto, helper: h, - mark: f, + mark: w, dscp: d }); } -- cgit v1.2.3