extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-09 15:38:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Avoid failure if parent does not have owner set

Browse Source
This commit is contained in:
Nathan Gray 2016-01-18 21:38:45 +00:00
parent e25442abce
commit 0726de19fc
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
calendar/js/et2_widget_event.js
View File

@ -633,10 +633,11 @@ var et2_calendar_event = et2_valueWidget.extend([et2_IDetachedDOM],
} }
// Also check participants against owner // Also check participants against owner
var owner_match = true;
if(event.participants && this._parent.options.owner) if(event.participants && this._parent.options.owner)
{ {
var parent_owner = this._parent.options.owner; var parent_owner = this._parent.options.owner;
var owner_match = false; owner_match = false;
for(var i = 0; i < this._parent.options.owner.length; i++ ) for(var i = 0; i < this._parent.options.owner.length; i++ )
{ {
if (parseInt(this._parent.options.owner[i]) < 0) if (parseInt(this._parent.options.owner[i]) < 0)
@ -690,13 +691,13 @@ var et2_calendar_event = et2_valueWidget.extend([et2_IDetachedDOM],
// Update daywise caches // Update daywise caches
var new_cache_id = app.classes.calendar._daywise_cache_id(event.date,this._parent.options.owner); var new_cache_id = app.classes.calendar._daywise_cache_id(event.date,this._parent.options.owner);
var new_daywise = egw.dataGetUIDdata(new_cache_id); var new_daywise = egw.dataGetUIDdata(new_cache_id);
new_daywise = new_daywise ? new_daywise.data : []; new_daywise = new_daywise && new_daywise.data ? new_daywise.data : [];
var old_cache_id = false; var old_cache_id = false;
if(this.options.value && this.options.value.date) if(this.options.value && this.options.value.date)
{ {
old_cache_id = app.classes.calendar._daywise_cache_id(this.options.value.date,this._parent.options.owner); old_cache_id = app.classes.calendar._daywise_cache_id(this.options.value.date,this._parent.options.owner);
var old_daywise = egw.dataGetUIDdata(old_cache_id); var old_daywise = egw.dataGetUIDdata(old_cache_id);
old_daywise = old_daywise ? old_daywise.data : []; old_daywise = old_daywise && old_daywise.data ? old_daywise.data : [];
old_daywise.splice(old_daywise.indexOf(this.options.value.id),1); old_daywise.splice(old_daywise.indexOf(this.options.value.id),1);
egw.dataStoreUID(old_cache_id,old_daywise); egw.dataStoreUID(old_cache_id,old_daywise);
} }
@ -704,7 +705,10 @@ var et2_calendar_event = et2_valueWidget.extend([et2_IDetachedDOM],
{ {
new_daywise.push(event.id); new_daywise.push(event.id);
} }
egw.dataStoreUID(new_cache_id,new_daywise); if(new_daywise.data !== null)
{
egw.dataStoreUID(new_cache_id,new_daywise);
}
return false; return false;
}, },