extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-09 15:00:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move Et2SelectAccount initial options to its own method, fix options were sometimes missing

Browse Source
This commit is contained in:
nathan 2023-10-19 15:03:16 -06:00
parent 56d248a2b1
commit 85cef367e2
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,6 +51,17 @@ export class Et2SelectAccount extends SelectAccountMixin(Et2StaticSelectMixin(Et
super.connectedCallback(); super.connectedCallback();
// Start fetch of select_options // Start fetch of select_options
this.fetchComplete = this._getAccounts();
}
/**
* Pre-fill the account list according to type & preferences
*
* @protected
* @internal
*/
protected _getAccounts()
{
const type = this.egw().preference('account_selection', 'common'); const type = this.egw().preference('account_selection', 'common');
let fetch = []; let fetch = [];
let process = (options) => let process = (options) =>
@ -72,11 +83,15 @@ export class Et2SelectAccount extends SelectAccountMixin(Et2StaticSelectMixin(Et
fetch.push(this.egw().accounts('owngroups').then(process)); fetch.push(this.egw().accounts('owngroups').then(process));
} }
else if(["primary_group", "groupmembers"].includes(type)) else if(type !== "none")
{ {
fetch.push(this.egw().accounts(this.accountType).then(process)); fetch.push(this.egw().accounts(this.accountType).then(process));
} }
this.fetchComplete = Promise.all(fetch);
return Promise.all(fetch).then(() =>
{
this.requestUpdate("select_options");
});
} }
set accountType(type : AccountType) set accountType(type : AccountType)