From: Jo-Philipp Wich <jo@mein.io>
Date: Tue, 15 Feb 2022 23:20:55 +0000 (+0100)
Subject: luci-app-firewall: fix setting unspecified zone on forwardings
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=21784446c1d0e1e9b2433727986e04a7e7ff86e5;p=project%2Fluci.git

luci-app-firewall: fix setting unspecified zone on forwardings

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

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 19274dfd3b..cbd4362049 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
@@ -149,9 +149,10 @@ return view.extend({
 			var config_name = this.uciconfig || this.map.config,
 			    section_id = uci.add(config_name, this.sectiontype);
 
+			uci.set(config_name, section_id, 'dest', 'lan');
 			uci.set(config_name, section_id, 'target', 'DNAT');
 
-			this.addedSection = section_id;
+			m.addedSection = section_id;
 			this.renderMoreOptionsModal(section_id);
 		};
 
@@ -229,7 +230,6 @@ return view.extend({
 		o.modalonly = true;
 		o.rmempty = true;
 		o.nocreate = true;
-		o.default = 'lan';
 
 		o = fwtool.addIPOption(s, 'general', 'dest_ip', _('Internal IP address'),
 			_('Redirect matched incoming traffic to the specified internal host'), 'ipv4', hosts);
diff --git a/modules/luci-base/htdocs/luci-static/resources/tools/widgets.js b/modules/luci-base/htdocs/luci-static/resources/tools/widgets.js
index 10b65be8ec..ae17d8197d 100644
--- a/modules/luci-base/htdocs/luci-static/resources/tools/widgets.js
+++ b/modules/luci-base/htdocs/luci-static/resources/tools/widgets.js
@@ -187,9 +187,10 @@ var CBIZoneSelect = form.ListValue.extend({
 						emptyval.setAttribute('data-value', '');
 					}
 
-					L.dom.content(emptyval.querySelector('span'), [
-						E('strong', _('Device')), E('span', ' (%s)'.format(_('input')))
-					]);
+					if (opt[0].allowlocal)
+						L.dom.content(emptyval.querySelector('span'), [
+							E('strong', _('Device')), E('span', ' (%s)'.format(_('input')))
+						]);
 
 					L.dom.content(anyval.querySelector('span'), [
 						E('strong', _('Any zone')), E('span', ' (%s)'.format(_('forward')))