luci-base: show default forwarding policy in zone forwarding list

The zone forwarding list widget misleadingly displays the intra-zone
forwarding policy as default policy action when no forwardings exist
instead of the appropriate global defaults forwarding policy which is
the one applied to inter-zone forwarded traffic.

Fix the issue by displaying the defaults policy and not the per-zone
policy to match what the firewall implementation is actually doing.

Fixes: #2213
Signed-off-by: Jo-Philipp Wich <jo@mein.io>

diff --git a/modules/luci-base/luasrc/view/cbi/firewall_zoneforwards.htm b/modules/luci-base/luasrc/view/cbi/firewall_zoneforwards.htm
index b38e4b13dbd229a5267e44904260b3860fe87efe..dc251dbd94d11eda56bf290ba07b3baf831b319a 100644 (file)
--- a/modules/luci-base/luasrc/view/cbi/firewall_zoneforwards.htm
+++ b/modules/luci-base/luasrc/view/cbi/firewall_zoneforwards.htm
@@ -63,7 +63,7 @@
                if empty then
        %>
                <label class="zonebadge zonebadge-empty">
-                       <strong><%=zone:forward():upper()%></strong>
+                       <strong><%=def:forward():upper()%></strong>
                </label>
        <% end %>
        </div>