extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 00:54:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix multi-day events extending outside the currently selected timespan blocked the cache for those days, leading to missing events.

Browse Source
This commit is contained in:
Nathan Gray 2015-11-13 23:21:16 +00:00
parent d6298d8c9b
commit c0ba0a5bcf
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
calendar/js/app.js
View File

@ -2326,6 +2326,13 @@ app.classes.calendar = AppJS.extend(
}
}
var updated_days = {};
var first = new Date(state.first);
var last = new Date(state.last);
var bounds = {
first: ''+first.getUTCFullYear() + sprintf('%02d',first.getUTCMonth()+1) + sprintf('%02d',first.getUTCDate()),
last: ''+last.getUTCFullYear() + sprintf('%02d',last.getUTCMonth()+1) + sprintf('%02d',last.getUTCDate())
};
for(var i = 0; i < data.order.length && data.total; i++)
{
var record = this.egw.dataGetUIDdata(data.order[i]);
@ -2333,10 +2340,18 @@ app.classes.calendar = AppJS.extend(
{
if(typeof updated_days[record.data.date] === 'undefined')
{
updated_days[record.data.date] = [];
// Check to make sure it's in range first, record.data.date is start date
// and could be before our start
if(record.data.date >= bounds.first && record.data.date <= bounds.last)
{
updated_days[record.data.date] = [];
}
}
if(typeof updated_days[record.data.date] != 'undefined')
{
// Copy, to avoid unwanted changes by reference
updated_days[record.data.date].push(record.data.row_id);
}
// Copy, to avoid unwanted changes by reference
updated_days[record.data.date].push(record.data.row_id);
// Check for multi-day events listed once
// Date must stay a string or we might cause problems with nextmatch
@ -2347,7 +2362,7 @@ app.classes.calendar = AppJS.extend(
if(dates.start.substr(0,10) !== dates.end.substr(0,10))
{
var end = new Date(Math.min(new Date(record.data.end), new Date(state.last)));
var t = new Date(record.data.start);
var t = new Date(Math.max(new Date(record.data.start), new Date(state.first)));
do
{

3
calendar/js/et2_widget_daycol.js
View File

@ -265,7 +265,8 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM],
if(event_ids == null || typeof event_ids.length == 'undefined') event_ids = [];
for(var i = 0; i < event_ids.length; i++)
{
var event = egw.dataGetUIDdata('calendar::'+event_ids[i]).data;
var event = egw.dataGetUIDdata('calendar::'+event_ids[i]);
event = event.data || false;
if(event && event.date && (
event.date === this.options.date ||
// Accept multi-day events