From c6dd3c03d26d568ffcd73849e210c49c85b476df Mon Sep 17 00:00:00 2001 From: Daniel Spitzer Date: Tue, 7 Oct 2025 18:43:17 +0200 Subject: [PATCH] =?UTF-8?q?Zeiterfassung=20Update=20*=20Nicht=20freigegebe?= =?UTF-8?q?ne=20Abwesenheiten=20werden=20nun=20in=20der=20Kalender=C3=BCbe?= =?UTF-8?q?rsicht=20strichliert=20dargestellt=20*=20Anpassungen=20in=20den?= =?UTF-8?q?=20Genehmigungsemails?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/Calendar/CalendarModel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/Calendar/CalendarModel.php b/application/Calendar/CalendarModel.php index 60f494bfe..6060ed314 100644 --- a/application/Calendar/CalendarModel.php +++ b/application/Calendar/CalendarModel.php @@ -1611,7 +1611,7 @@ WHERE `TimerecordingCategory`.`hourday`!='1' AND `TimerecordingCategory`.`hourda } $updateArray = []; - $res = $db->select("cal_events", 'id,microsoft_id,name,microsoft_ical_uid,start_time,end_time', "id = '" . $id . "' LIMIT 1"); + $res = $db->select("cal_events", 'id,microsoft_id,name,microsoft_ical_uid,linked_event_uid,start_time,end_time', "id = '" . $id . "' LIMIT 1"); if ($db->num_rows($res)) { $result = $db->fetch_object($res); @@ -1656,7 +1656,7 @@ WHERE `TimerecordingCategory`.`hourday`!='1' AND `TimerecordingCategory`.`hourda $db->insert("TheTool_CalendarQueue", $data); } - $res = $db->select("cal_events", 'id,microsoft_id,name,microsoft_ical_uid,start_time,end_time,calendar_id', "id != '" . $id . "' AND microsoft_ical_uid = '" . $result->microsoft_ical_uid . "' "); + $res = $db->select("cal_events", 'id,microsoft_id,name,microsoft_ical_uid,start_time,end_time,calendar_id', "id != '" . $id . "' AND (microsoft_ical_uid = '" . $result->microsoft_ical_uid . "' || linked_event_uid = '" .$result->linked_event_uid."') "); while ($row = $db->fetch_object($res)) { $updateArray = []; $updateArray['name'] = $newname;