diff --git a/api/js/etemplate/Et2Select/Et2SelectAccount.ts b/api/js/etemplate/Et2Select/Et2SelectAccount.ts index dcb5f5decb..8827a27cab 100644 --- a/api/js/etemplate/Et2Select/Et2SelectAccount.ts +++ b/api/js/etemplate/Et2Select/Et2SelectAccount.ts @@ -8,7 +8,7 @@ */ import {Et2Select} from "./Et2Select"; -import {SelectOption} from "./FindSelectOptions"; +import {cleanSelectOptions, SelectOption} from "./FindSelectOptions"; import {Et2Image} from "../Et2Image/Et2Image"; import {SelectAccountMixin} from "./SelectAccountMixin"; import {Et2StaticSelectMixin} from "./StaticOptions"; @@ -58,14 +58,14 @@ export class Et2SelectAccount extends SelectAccountMixin(Et2StaticSelectMixin(Et { if(this.accountType === 'both') { - fetch.push(this.egw().accounts('accounts').then(options => {this.static_options = this.static_options.concat(options)})); + fetch.push(this.egw().accounts('accounts').then(options => {this.static_options = this.static_options.concat(cleanSelectOptions(options))})); } - fetch.push(this.egw().accounts('owngroups').then(options => {this.static_options = this.static_options.concat(options)})); + fetch.push(this.egw().accounts('owngroups').then(options => {this.static_options = this.static_options.concat(cleanSelectOptions(options))})); } else { - fetch.push(this.egw().accounts(this.accountType).then(options => {this.static_options = this.static_options.concat(options)})); + fetch.push(this.egw().accounts(this.accountType).then(options => {this.static_options = this.static_options.concat(cleanSelectOptions(options))})); } this.fetchComplete = Promise.all(fetch) .then(() => this._renderOptions()); diff --git a/api/js/etemplate/Et2Select/SelectAccountMixin.ts b/api/js/etemplate/Et2Select/SelectAccountMixin.ts index 4a6a68aa7e..0415dca133 100644 --- a/api/js/etemplate/Et2Select/SelectAccountMixin.ts +++ b/api/js/etemplate/Et2Select/SelectAccountMixin.ts @@ -79,7 +79,7 @@ export const SelectAccountMixin = >(superclass this.egw().link_title('api-accounts', id, true).then(title => { option.label = title; - this.requestUpdate(); + this.requestUpdate('select_options'); }); } }