holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix sometimes first non-empty label used for empty value

Browse Source 
seems update got triggered before empty_label was set
This commit is contained in:
ralf 2022-02-28 15:21:23 +02:00
parent e567a0d465
commit eff1f10484
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -231,11 +231,13 @@ export class Et2Select extends Et2WidgetWithSelect
); );
} }
} }
if(changedProperties.has('select_options') || changedProperties.has("value")) if (changedProperties.has('select_options') || changedProperties.has("value") || changedProperties.has('empty_label'))
{ {
if(this.get_select_options().length > 0 && this.get_select_options().filter((option) => option.value == this.modalValue).length === 0) // value not in options AND NOT (having an empty label and value)
if (this.get_select_options().length > 0 && this.get_select_options().filter((option) => option.value == this.modalValue).length === 0 &&
!(typeof this.empty_label !== 'undefined' && (this.modalValue||"") === ""))
{ {
// Not in list, use first option // --> use first option
this.modalValue = this.get_select_options()[0]?.value || ""; this.modalValue = this.get_select_options()[0]?.value || "";
} }
// Re-set value, the option for it may have just shown up // Re-set value, the option for it may have just shown up