extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-16 18:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Calendar: More sidebox owner fixes

Browse Source 
- another instance of remote class causing problems
- remove duplicates to avoid warning message
This commit is contained in:
nathan 2023-04-28 11:27:26 -06:00
parent 84dd9284e2
commit 8e9071acc8
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/js/etemplate/Et2Select/FindSelectOptions.ts
View File

@ -259,15 +259,15 @@ export function cleanSelectOptions(options : SelectOption[] | string[] | object)
option.value = option.id; option.value = option.id;
delete option.id; delete option.id;
} }
if (typeof option.value === 'number') if(typeof option.value === 'number')
{ {
option.value = option.value.toString(); option.value = option.value.toString();
} }
if (typeof option.label !== 'string') if(typeof option.label !== 'string')
{ {
fixed_options.push(...cleanSelectOptions(option.label)); fixed_options.push(...cleanSelectOptions(option.label));
} }
else else if(fixed_options.findIndex(o => o.value == option.value) == -1)
{ {
fixed_options.push(option); fixed_options.push(option);
} }

1
api/js/etemplate/Et2Select/SearchMixin.ts
View File

@ -542,6 +542,7 @@ export const Et2WithSearchMixin = <T extends Constructor<LitElement>>(superclass
if(options.findIndex(o => o.value == remote.value) != -1) if(options.findIndex(o => o.value == remote.value) != -1)
{ {
this._selected_remote.splice(remote_index, 1); this._selected_remote.splice(remote_index, 1);
this.querySelector('[value="' + remote.value + '"]')?.classList.remove("remote");
} }
} }
} }

2
calendar/js/app.ts
View File

@ -3779,7 +3779,7 @@ export class CalendarApp extends EgwApp
for(const id of Object.keys(event.participants)) for(const id of Object.keys(event.participants))
{ {
if(parseInt(id) >= 0) if(parseInt(id) >= 0 || isNaN(parseInt(id)))
{ {
continue; continue;
} }