Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Fixes: #5685
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 21784446c1)
This commit is contained in:
Jo-Philipp Wich 2022-02-16 00:20:55 +01:00
parent 161880046f
commit 59c3392946
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/forwards.js
View file

@ -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);

7
modules/luci-base/htdocs/luci-static/resources/tools/widgets.js
View file

@ -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')))