From b15c62071cd971eebf82547b4969d975d237c7a3 Mon Sep 17 00:00:00 2001 From: Anton Kikin Date: Wed, 17 Jul 2019 19:19:45 +0300 Subject: luci-app-firewall: format protocol family for forwards and rules Fixes: #2878 Signed-off-by: Anton Kikin --- .../htdocs/luci-static/resources/tools/firewall.js | 9 +++++++++ .../htdocs/luci-static/resources/view/firewall/forwards.js | 3 ++- .../htdocs/luci-static/resources/view/firewall/rules.js | 3 ++- 3 files changed, 13 insertions(+), 2 deletions(-) (limited to 'applications/luci-app-firewall/htdocs/luci-static') diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js b/applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js index 6785d1ca63..198528aaa5 100644 --- a/applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js +++ b/applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js @@ -211,6 +211,15 @@ return L.Class.extend({ return rv; }, + fmt_family: function(family) { + if (family == 'ipv4') + return _('IPv4'); + else if (family == 'ipv6') + return _('IPv6'); + else + return _('IPv4 and IPv6'); + }, + fmt_proto: function(x, icmp_types) { var rv = E([]), l = L.toArray(x); diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js index 93bfc29188..ffbfe3ccd0 100644 --- a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js +++ b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js @@ -42,7 +42,8 @@ function fmt(fmt /*, ...*/) { } function forward_proto_txt(s) { - return fmt('%s-%s', _('IPv4'), + return fmt('%s-%s', + fwtool.fmt_family(uci.get('firewall', s, 'family')), fwtool.fmt_proto(uci.get('firewall', s, 'proto'), uci.get('firewall', s, 'icmp_type')) || 'TCP+UDP'); } 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 d2d1916322..e67397268c 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 @@ -42,7 +42,8 @@ function fmt(fmt /*, ...*/) { } function forward_proto_txt(s) { - return fmt('%s-%s', _('IPv4'), + return fmt('%s-%s', + fwtool.fmt_family(uci.get('firewall', s, 'family')), fwtool.fmt_proto(uci.get('firewall', s, 'proto'), uci.get('firewall', s, 'icmp_type')) || 'TCP+UDP'); } -- cgit v1.2.3