luci-app-firewall: fix family display for port forwards

The underlying fw3 program currently only does IPv4 port forwards while
LuCI incorrectly reports IPv4 + IPv6 for each forward. Adjust the text
accordingly to fix this.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit a178cdb5cf67a3da8f37e5a8fd5d59fef301fb83)

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 dc2249275e7e3cad735141e6afd6b06999ddf87a..af2f9b76e84fc23c3b80d4b64652801b5314a044 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
@@ -43,7 +43,7 @@ function fmt(fmt /*, ...*/) {
 
 function forward_proto_txt(s) {
        return fmt('%s-%s',
-               fwtool.fmt_family(uci.get('firewall', s, 'family')),
+               fwtool.fmt_family('ipv4'),
                fwtool.fmt_proto(uci.get('firewall', s, 'proto'),
                                 uci.get('firewall', s, 'icmp_type')) || 'TCP+UDP');
 }