The_Great_Archive/cryptpad
1
0
Fork 0
mirror of https://github.com/cryptpad/cryptpad.git synced 2026-09-14 11:05:41 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1936 from cryptpad/calendar-fix

Browse Source 
Fix missing recurring calendar after update
This commit is contained in:
yflory 2025-06-27 15:37:52 +02:00 committed by GitHub
commit da6ffaaea3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/recurrence.js
View File

@ -687,7 +687,6 @@ const factory = (Util) => {
return;
}
var stop = false;
var newrule = false;
_toAdd.some(function (_newS) {
@ -700,6 +699,11 @@ const factory = (Util) => {
_ev.start = +_evS;
_ev.end = +_evE;
_ev._count = c;
Rec.applyUpdates([_ev]);
_evS = new Date(_ev.start);
_evE = new Date(_ev.end);
if (_ev.isAllDay && _ev.startDay) { _ev.startDay = getDateStr(_evS); }
if (_ev.isAllDay && _ev.endDay) { _ev.endDay = getDateStr(_evE); }

3
www/calendar/inner.js
View File

@ -1000,7 +1000,8 @@ define([
// Mark selected months as done
todo.forEach(function (monthId) { APP.recurringDone.push(monthId); });
cal.createSchedules(applyUpdates(toAdd));
//cal.createSchedules(applyUpdates(toAdd));
cal.createSchedules(toAdd);
};
updateRecurring = function () {
try {