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

Fix for missing event & group by month

Browse Source
This commit is contained in:
nathangray 2017-02-24 10:29:47 -07:00
parent 47643f06a6
commit abc9252069
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
calendar/js/et2_widget_planner.js
View File

@ -1813,8 +1813,10 @@ 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;
// Try to determine rows interested // Try to determine rows interested
if(event && event.data && this.grouper) if(event.data && this.grouper)
{ {
this.grouper.group.call(this, labels, events, event.data); this.grouper.group.call(this, labels, events, event.data);
} }
@ -1829,7 +1831,8 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
} }
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.participants[id] && this.options.group_by === 'user' ||
event.data.category === id && this.options.group_by === 'category' 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);