extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-21 23:43:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Calendar: Fix group calendar could be missing events under some circumstances

Browse Source 
Static account options added to CalendarOwner were blocking the group data needed, fixed by using sent options over account options
This commit is contained in:
nathan 2023-07-25 11:15:51 -06:00
parent b44ea1b2b0
commit e0d284d3ae
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,7 @@ export const Et2StaticSelectMixin = <T extends Constructor<Et2WidgetWithSelect>>
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()];
}

2
calendar/js/CalendarOwner.ts
View File

@ -89,7 +89,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]);
}