holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Calendar - Fix bug where planner by user would not show events with group invitation, planner by category would not show events with sub-categories

Browse Source
This commit is contained in:
nathangray 2017-04-05 13:48:23 -06:00
parent 53916b71f6
commit 0ac55aad97
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
calendar/js/et2_widget_planner.js
View File

@ -1822,6 +1822,7 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
var event = egw.dataGetUIDdata('calendar::'+data[i]); var event = egw.dataGetUIDdata('calendar::'+data[i]);
if(!event) continue; if(!event) continue;
events = {};
// Try to determine rows interested // Try to determine rows interested
if(event.data && this.grouper) if(event.data && this.grouper)
@ -1837,11 +1838,7 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
{ {
this.cache[id] = []; this.cache[id] = [];
} }
if(this.cache[id].indexOf(event.data.row_id) === -1 && ( if(this.cache[id].indexOf(event.data.row_id) === -1)
event.data.participants[id] && this.options.group_by === 'user' ||
event.data.category === id && this.options.group_by === 'category' ||
this.options.group_by === 'month'
))
{ {
this.cache[id].push(event.data.row_id); this.cache[id].push(event.data.row_id);
} }
@ -1857,7 +1854,7 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
// Could be an event no row is interested in, could be a problem. // Could be an event no row is interested in, could be a problem.
// Just redraw everything // Just redraw everything
invalidate = true; invalidate = true;
break; continue;
} }
// If displaying by category, we need the infolog (or other app) categories too // If displaying by category, we need the infolog (or other app) categories too