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

luci-base: don't treat .rmempty flag as optional for ListValue widgets

Browse source 
Restore the old CBI behaviour of not automatically rendering empty
selection choices in ListValue select dropdowns when .rmempty is
specified.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2019-07-27 22:17:33 +02:00
parent b949c02624
commit 2d3470b700
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/luci-base/htdocs/luci-static/resources/form.js
View file

@ -1460,7 +1460,7 @@ var CBIListValue = CBIValue.extend({
id: this.cbid(section_id), id: this.cbid(section_id),
size: this.size, size: this.size,
sort: this.keylist, sort: this.keylist,
optional: this.rmempty || this.optional, optional: this.optional,
placeholder: this.placeholder, placeholder: this.placeholder,
validate: L.bind(this.validate, this, section_id) validate: L.bind(this.validate, this, section_id)
}); });

2
modules/luci-base/htdocs/luci-static/resources/ui.js
View file

@ -243,7 +243,7 @@ var UISelect = UIElement.extend({
'multiple': this.options.multiple ? '' : null 'multiple': this.options.multiple ? '' : null
})); }));
if (this.options.optional) if (this.options.optional || this.choices.hasOwnProperty(''))
frameEl.lastChild.appendChild(E('option', { frameEl.lastChild.appendChild(E('option', {
'value': '', 'value': '',
'selected': (this.values.length == 0 || this.values[0] == '') ? '' : null 'selected': (this.values.length == 0 || this.values[0] == '') ? '' : null

2
modules/luci-base/luasrc/view/cbi/lvalue.htm
View file

@ -7,7 +7,7 @@
sort = self.keylist, sort = self.keylist,
widget = self.widget, widget = self.widget,
datatype = self.datatype, datatype = self.datatype,
optional = self.optional or self.rmempty, optional = self.optional,
placeholder = self.placeholder placeholder = self.placeholder
} }
}))%>></div> }))%>></div>