Proxmox/proxmox-widget-toolkit
5
0
Fork 0
Code Pull Requests Releases Activity

ComboGrid: fix on-load validation for blank values

Browse Source 
Commit f32aa3df74 fixed marking multi-select fields with where the store
did not contain a valid value after loading.

However, it introduced a bug for single-select fields where the value
(before the store-load) was explicitly set to be empty (when that should
be invalid because of allowBlank === false).

Fix the logic to correctly detect all scenarios (with def being the
value selected before the store loaded, i.e. undefined or an empty
array):

  !allowBlank &&
    ( def is an array but empty || def is not an array and falsy )

Also use correct error message (localized by ExtJS itself).

Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
This commit is contained in:
Stefan Reiter 2020-01-29 11:27:18 +01:00 committed by Thomas Lamprecht
parent 4e78d7190d
commit 15206214d9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
form/ComboGrid.js
View File

@ -459,10 +459,10 @@ Ext.define('Proxmox.form.ComboGrid', {
if (me.autoSelect && rec && rec.data) {
def = rec.data[me.valueField];
me.setValue(def, true);
} else if (!me.allowBlank && ((Ext.isArray(def) && def.length) || def)) {
} else if (!me.allowBlank && !(Ext.isArray(def) ? def.length : def)) {
me.setValue(def);
if (!me.notFoundIsValid) {
me.markInvalid(gettext('Invalid Value'));
me.markInvalid(me.blankText);
}
}
}