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

Fix option merge unique filter left out some options

Browse Source
This commit is contained in:
nathan 2022-07-19 10:30:48 -06:00
parent f79c57f048
commit 5ee60c0af1
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,18 +46,10 @@ export const Et2StaticSelectMixin = <T extends Constructor<Et2WidgetWithSelect>>
// @ts-ignore // @ts-ignore
const options = super.select_options || []; const options = super.select_options || [];
// make sure result is unique // make sure result is unique
if (options.length && this.static_options.length)
{ return [...new Map([...options, ...(this.static_options || [])].map(item =>
const union = [].concat(options); [item.value, item])).values()];
this.static_options.forEach(option => {
if (!union.filter(opt => opt.value == option.value).length)
{
union.concat(option);
}
});
return union;
}
return [...options, ...(this.static_options || [])];
} }
set select_options(new_options) set select_options(new_options)