luci-base: Enforce maximal firewall zone name length with fw3 only

firewall3 enforces the zone name length. firewall4 does not. #7549 (comment) Signed-off-by: Paul Donald <[email protected]>
openwrt · Jan 10, 2025 · a67d683 · a67d683
1 parent a075566
commit a67d683
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js b/applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js
@@ -130,7 +130,7 @@ return view.extend({
 		o.placeholder = _('Unnamed zone');
 		o.modalonly = true;
 		o.rmempty = false;
-		o.datatype = 'and(uciname,maxlength(11))';
+		o.datatype = L.hasSystemFeature('firewall4') ? '' : 'and(uciname,maxlength(11))';
 		o.write = function(section_id, formvalue) {
 			var cfgvalue = this.cfgvalue(section_id);
 

diff --git a/modules/luci-base/htdocs/luci-static/resources/tools/widgets.js b/modules/luci-base/htdocs/luci-static/resources/tools/widgets.js
@@ -148,7 +148,7 @@ var CBIZoneSelect = form.ListValue.extend({
 			display_items: this.display_size || this.size || 3,
 			dropdown_items: this.dropdown_size || this.size || 5,
 			validate: L.bind(this.validate, this, section_id),
-			datatype: 'and(uciname,maxlength(11))',
+			datatype: L.hasSystemFeature('firewall4') ? '' : 'and(uciname,maxlength(11))',
 			create: !this.nocreate,
 			create_markup: '' +
 				'<li data-value="{{value}}">' +