From: Jo-Philipp Wich <jo@mein.io>
Date: Wed, 10 Oct 2018 06:32:54 +0000 (+0200)
Subject: luci-base: show default forwarding policy in zone forwarding list
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=24d1e7608b23cd80eca41a78916a2a0f2bd224c2;p=project%2Fluci.git

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 b38e4b13db..dc251dbd94 100644
--- 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>