extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 06:30:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Et2SelectAccount couldn't have non-account options, so freeEntries didn't show up

Browse Source
This commit is contained in:
nathan 2022-09-01 08:30:43 -06:00
parent 2e319319d1
commit 1bbcdbfeb7
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api/js/etemplate/Et2Select/Et2SelectAccount.ts
View File

@ -77,25 +77,29 @@ export class Et2SelectAccount extends Et2Select
{ {
return []; return [];
} }
let select_options : Array<SelectOption> = []; let select_options : Array<SelectOption> = [...this.__select_options] || [];
// for primary_group we only display owngroups == own memberships, not other groups // for primary_group we only display owngroups == own memberships, not other groups
if (type === 'primary_group' && this.accountType !== 'accounts') if (type === 'primary_group' && this.accountType !== 'accounts')
{ {
if (this.accountType === 'both') if (this.accountType === 'both')
{ {
select_options = this.egw().accounts('accounts'); select_options = select_options.concat(this.egw().accounts('accounts'));
} }
select_options = select_options.concat(this.egw().accounts('owngroups')); select_options = select_options.concat(this.egw().accounts('owngroups'));
} }
else else
{ {
select_options = this.egw().accounts(this.accountType); select_options = select_options.concat(this.egw().accounts(this.accountType));
} }
// egw.accounts returns value as number, causing the et2-select to not match the option // egw.accounts returns value as number, causing the et2-select to not match the option
select_options.forEach(option => { select_options.forEach(option =>
{
option.value = option.value.toString(); option.value = option.value.toString();
}); });
return select_options; return select_options.filter((value, index, self) =>
{
return self.findIndex(v => v.value === value.value) === index;
});
} }
set select_options(new_options : SelectOption[]) set select_options(new_options : SelectOption[])