extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 16:48:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Calendar: Fix opening a calendar entry sometimes doesn't work

Browse Source
This commit is contained in:
Hadi Nategh 2016-07-22 12:03:46 +02:00
parent 207be43f17
commit a58c881af1
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
calendar/js/et2_widget_event.js
View File

@ -948,7 +948,7 @@ et2_calendar_event.owner_check = function owner_check(event, parent, owner_too)
continue; continue;
} }
} }
if (parseInt(parent_owner[i]) < 0) if (parseInt(parent_owner[i]) < 0)
{ {
// Add in groups, if we can get them (this is syncronous) // Add in groups, if we can get them (this is syncronous)
@ -1021,7 +1021,16 @@ et2_calendar_event.recur_prompt = function(event_data, callback, extra_data)
{ {
var edit_id = event_data.app_id; var edit_id = event_data.app_id;
var edit_date = event_data.start; var edit_date = event_data.start;
var egw = this.egw ? (typeof this.egw == 'function' ? this.egw() : this.egw) : window.opener && typeof window.opener.egw != 'undefined' ? window.opener.egw('calendar'):window.egw('calendar');
// seems window.opener somehow in certian conditions could be from different origin
// we try to catch the exception and in this case retrive the egw object from current window.
try {
var egw = this.egw ? (typeof this.egw == 'function' ? this.egw() : this.egw) : window.opener && typeof window.opener.egw != 'undefined' ? window.opener.egw('calendar'):window.egw('calendar');
}
catch(e){
var egw = window.egw('calendar');
}
var that = this; var that = this;
var extra_params = extra_data && typeof extra_data == 'object' ? extra_data : {}; var extra_params = extra_data && typeof extra_data == 'object' ? extra_data : {};
@ -1085,7 +1094,15 @@ et2_calendar_event.recur_prompt = function(event_data, callback, extra_data)
*/ */
et2_calendar_event.series_split_prompt = function(event_data, instance_date, callback) et2_calendar_event.series_split_prompt = function(event_data, instance_date, callback)
{ {
var egw = this.egw ? (typeof this.egw == 'function' ? this.egw() : this.egw) : window.opener && typeof window.opener.egw != 'undefined' ? window.opener.egw('calendar'):window.egw('calendar'); // seems window.opener somehow in certian conditions could be from different origin
// we try to catch the exception and in this case retrive the egw object from current window.
try {
var egw = this.egw ? (typeof this.egw == 'function' ? this.egw() : this.egw) : window.opener && typeof window.opener.egw != 'undefined' ? window.opener.egw('calendar'):window.egw('calendar');
}
catch(e){
var egw = window.egw('calendar');
}
var that = this; var that = this;
if(typeof instance_date == 'string') if(typeof instance_date == 'string')