diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2019-07-18 12:28:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-18 12:28:42 +0200 |
| commit | 776e6d540990eabcd134d0bee8dd54695d9c53a7 (patch) | |
| tree | d404f69600a0a3fb725cf7f96c52aa44aa619220 /applications | |
| parent | d52990bc82a9c6ba95375bb15122c6a349db91d1 (diff) | |
| parent | b15c62071cd971eebf82547b4969d975d237c7a3 (diff) | |
Merge pull request #2880 from tano-systems/pr/fix-for-2878
luci-app-firewall: format protocol family for forwards and rules
Diffstat (limited to 'applications')
3 files changed, 13 insertions, 2 deletions
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 6785d1ca6..198528aaa 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 93bfc2918..ffbfe3ccd 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 d2d191632..e67397268 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'); } |