extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-05 17:52:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Et2Select: It was impossible to have "," as an option value, as it would get split by fix_bad_value()

Browse Source
This commit is contained in:
nathan 2023-04-03 08:52:31 -06:00
parent de4b2746e5
commit a9d2a3972c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/js/etemplate/Et2Select/Et2Select.ts
View File

@ -436,7 +436,9 @@ export class Et2Select extends Et2WithSearchMixin(Et2WidgetWithSelect)
}
// If no value is set, choose the first option
// Only do this on once during initial setup, or it can be impossible to clear the value
const valueArray = Array.isArray(this.value) ? this.value : (!this.value ? [] : this.value.toString().split(','));
const valueArray = Array.isArray(this.value) ? this.value : (
!this.value ? [] : (this.multiple ? this.value.toString().split(',') : [this.value])
);
// value not in options --> use emptyLabel, if exists, or first option otherwise
if(this.select_options.filter((option) => valueArray.find(val => val == option.value) ||
@ -462,7 +464,7 @@ export class Et2Select extends Et2WithSearchMixin(Et2WidgetWithSelect)
set_value(val : string | string[] | number | number[])
{
if(typeof val === 'string' && val.indexOf(',') !== -1)
if(typeof val === 'string' && val.indexOf(',') !== -1 && (this.multiple || val.length >= 3))
{
val = val.split(',');
}