luci-app-firewall: format protocol family for forwards and rules

Fixes: #2878
Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>

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 6785d1ca6303d2d75b51a2f322dc103b389b6068..198528aaa59a224a69c60eb34df3d275a80ae29c 100644 (file)
--- 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 93bfc2918876f675e9e80b0d1e1622243ac8c65e..ffbfe3ccd07bb6bf08a5d158a9d42a1bbb0f8b66 100644 (file)
--- 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 d2d191632243f029c51bcc82cb1cd094ad350536..e67397268c1c4c7876e221ae462808453bb87038 100644 (file)
--- 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');
 }