Skip to content

Commit 6f9a3df

Browse files
committed
fix some regressions
1 parent 515553e commit 6f9a3df

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

classes/OCRestClient/SchedulerClient.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public function updateEventForSeminar($course_id, $resource_id, $termin_id, $eve
141141

142142
// also reset any custom made changes to the recording length, to prevent any unwanted effects for alternate schedules (if even activated)
143143
$event->start = $date->date;
144-
$event->end = $date->date;
144+
$event->end = $date->end_time;
145145

146146
$event->store();
147147
}

cronjobs/refresh_scheduled_events.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,11 @@ public function execute($last_result, $parameters = [])
8888
unset($curated_events[$se['event_id']]);
8989

9090
if ($cd->room_booking->resource_id == $se['resource_id']
91-
|| $cd->room_booking->date != $se['coursedate_start']
92-
|| $cd->room_booking->end_time != $se['coursedate_end'])
93-
{
91+
&& (
92+
$cd->room_booking->date != $se['coursedate_start']
93+
|| $cd->room_booking->end_time != $se['coursedate_end']
94+
)
95+
) {
9496
$scheduler_client = SchedulerClient::create($se['seminar_id']);
9597
$scheduler_client->updateEventForSeminar($se['seminar_id'], $se['resource_id'], $se['date_id'], $se['event_id']);
9698

0 commit comments

Comments
 (0)