Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge branch 'spidev' into 'master'

Browse Source 
Bugfix Calender Update sync richtung MS

See merge request fronk/thetool!1697
This commit is contained in:
Daniel Spitzer
2025-09-01 20:12:30 +00:00
parent b34b773f66 fc23c5ce5f
commit abe4de5541
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
application/Calendar/CalendarModel.php
View File

@@ -650,11 +650,14 @@ WHERE `TimerecordingCategory`.`hourday`!='1' AND `TimerecordingCategory`.`hourda
$start = ((($r->start - 7200000) / 1000)); $start = ((($r->start - 7200000) / 1000));
$end = ((($r->end - 7200000) / 1000)); $end = ((($r->end - 7200000) / 1000));
$originalend = $end;
if ($title) { if ($title) {
$start = strtotime($r->start); $start = strtotime($r->start);
$end = strtotime($r->end); $end = strtotime($r->end);
} }
$originalend = $end;
$allday = ($r->allday); $allday = ($r->allday);
if ($allday) { if ($allday) {
$start = $start + 7200; $start = $start + 7200;
@@ -804,8 +807,6 @@ WHERE `TimerecordingCategory`.`hourday`!='1' AND `TimerecordingCategory`.`hourda
$db->delete("tmp_cal_events_attachments", "id = '" . $tmpid . "'"); $db->delete("tmp_cal_events_attachments", "id = '" . $tmpid . "'");
} }
} }
$updateArray['attachments'] = $attachments; $updateArray['attachments'] = $attachments;
$updateArray['end_time'] = $originalend; $updateArray['end_time'] = $originalend;
} }