diff --git a/api/js/etemplate/Et2Select/StaticOptions.ts b/api/js/etemplate/Et2Select/StaticOptions.ts index 57e430950c..7ea1de31a7 100644 --- a/api/js/etemplate/Et2Select/StaticOptions.ts +++ b/api/js/etemplate/Et2Select/StaticOptions.ts @@ -53,7 +53,7 @@ export const Et2StaticSelectMixin = > const options = super.select_options || []; // make sure result is unique - return [...new Map([...options, ...(this.static_options || [])].map(item => + return [...new Map([...(this.static_options || []), ...options].map(item => [item.value, item])).values()]; } diff --git a/calendar/js/CalendarOwner.ts b/calendar/js/CalendarOwner.ts index e48131104d..0c7e211c1d 100644 --- a/calendar/js/CalendarOwner.ts +++ b/calendar/js/CalendarOwner.ts @@ -88,7 +88,7 @@ export class CalendarOwner extends Et2StaticSelectMixin(Et2Select) { for(var i = 0; i < this.value.length; i++) { - if(!this.menuItems.find(o => o.value == this.value[i])) + if(!this.select_options.find(o => o.value == this.value[i])) { missing_labels.push(this.value[i]); }