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

Fix missing value in some static option selects

Browse Source 
Shoelace select initially rejects the value due to missing option, and needs to be re-set once our options have arrived
This commit is contained in:
nathan 2023-11-16 10:09:20 -07:00
parent 5eaf6a275f
commit 3cf4cbab9a
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/js/etemplate/Et2Select/Select/Et2SelectAccount.ts
View File

@ -91,6 +91,7 @@ export class Et2SelectAccount extends SelectAccountMixin(Et2StaticSelectMixin(Et
return Promise.all(fetch).then(() => return Promise.all(fetch).then(() =>
{ {
this.requestUpdate("select_options"); this.requestUpdate("select_options");
this.value = this.value;
}); });
} }

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

@ -91,6 +91,12 @@ export class Et2SelectCategory extends Et2StaticSelectMixin(Et2Select)
{ {
this._static_options = cleanSelectOptions(options); this._static_options = cleanSelectOptions(options);
this.requestUpdate("select_options"); this.requestUpdate("select_options");
// Shoelace select has rejected our value due to missing option by now, so re-set it
this.updateComplete.then(() =>
{
this.value = this.value;
});
}); });
} }
} }

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

@ -82,6 +82,12 @@ export const Et2StaticSelectMixin = <T extends Constructor<Et2WidgetWithSelect>>
{ {
this._static_options = new_static_options; this._static_options = new_static_options;
this.requestUpdate("select_options"); this.requestUpdate("select_options");
// Shoelace select may have rejected our value due to missing option by now, so re-set it
if(this.value && this.select && this.value !== this.select.value)
{
this.value = this.value;
}
} }
/** /**