extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix diverse calendar errors #60294

Browse Source 
thought not sure how this is supposed to work in 21.1, both look like a general problem
This commit is contained in:
Ralf Becker 2021-07-06 13:05:56 +02:00
parent cbed97de6d
commit 51b0888b5d
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/js/etemplate/etemplate2.ts
View File

@ -985,7 +985,7 @@ export class etemplate2
_root.iterateOver(function (_widget) _root.iterateOver(function (_widget)
{ {
// The widget must have an id to be included in the values array // The widget must have an id to be included in the values array
if (_widget.id == "") { if (_widget.id === undefined || _widget.id === "") {
return; return;
} }

6
calendar/js/app.ts
View File

@ -630,10 +630,8 @@ export class CalendarApp extends EgwApp
let filtered = Object.keys(this._grants).filter(account => this.state.owner.indexOf(account) >= 0); let filtered = Object.keys(this._grants).filter(account => this.state.owner.indexOf(account) >= 0);
// Check if we're interested in displaying by owner / participant // Check if we're interested in displaying by owner / participant
let owner_check = et2_calendar_event.owner_check(cal_event, jQuery.extend({}, let owner_check = et2_calendar_event.owner_check(cal_event, this.et2, jQuery.extend({},
{options: {owner: filtered}}, {options: {owner: filtered}}));
this.et2
));
if(!owner_check) if(!owner_check)
{ {
// The owner is not in the list of what we're allowed / care about // The owner is not in the list of what we're allowed / care about