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

Fix infinite loop in monthly planner with multi-month events

Browse Source
This commit is contained in:
Nathan Gray 2015-11-14 00:09:45 +00:00
parent 61d4e1535e
commit 6e924a3700
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
calendar/js/et2_widget_planner.js
View File

@ -514,16 +514,16 @@ var et2_calendar_planner = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResize
var end = new Date(event.end); var end = new Date(event.end);
end = new Date(end.valueOf() + end.getTimezoneOffset() * 60 * 1000); end = new Date(end.valueOf() + end.getTimezoneOffset() * 60 * 1000);
var end_key = end.getFullYear() +'-'+end.getMonth(); var end_key = end.getFullYear() +'-'+end.getMonth();
var year = start.getFullYear();
var month = start.getMonth();
while(key !== end_key) while(key !== end_key)
{ {
var year = start.getFullYear(); if (++month > 11)
var month = start.getMonth();
if (++month > 12)
{ {
++year; ++year;
month = 1; month = 0;
} }
key = sprintf('%04d-%02d',year,month); key = sprintf('%04d-%d',year,month);
for(var i = 0; i < labels.length; i++) for(var i = 0; i < labels.length; i++)
{ {
if(labels[i].id == key) if(labels[i].id == key)
@ -764,6 +764,7 @@ var et2_calendar_planner = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResize
// Group the events // Group the events
var events = {}; var events = {};
debugger;
for(var i = 0; i < this.value.length; i++) for(var i = 0; i < this.value.length; i++)
{ {
grouper.group.call(this, labels, events, this.value[i]); grouper.group.call(this, labels, events, this.value[i]);