summaryrefslogtreecommitdiffhomepage
path: root/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall
diff options
context:
space:
mode:
authorAnton Kikin <a.kikin@tano-systems.com>2019-07-17 19:19:45 +0300
committerAnton Kikin <a.kikin@tano-systems.com>2019-07-18 12:46:00 +0300
commitb15c62071cd971eebf82547b4969d975d237c7a3 (patch)
tree565ffd01edb68379206e13a3dd69ffffd9909474 /applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall
parentc58d5f6977236b1dfb60ff4f4e19b86ee2b3d92a (diff)
luci-app-firewall: format protocol family for forwards and rules
Fixes: #2878 Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>
Diffstat (limited to 'applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall')
-rw-r--r--applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js3
-rw-r--r--applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js3
2 files changed, 4 insertions, 2 deletions
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');
}