From e40d24ec2fb23581733726ee4c89c8ebeb7a5847 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Till=20Gl=C3=B6ggler?= <till@gundk.it>
Date: Fri, 8 Oct 2021 15:11:30 +0200
Subject: [PATCH] fixes #284, fix regression
---
lib/models/resources/ResourceRequest.class.php | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/lib/models/resources/ResourceRequest.class.php b/lib/models/resources/ResourceRequest.class.php
index 03be8af42ef..01d40fe47c7 100644
--- a/lib/models/resources/ResourceRequest.class.php
+++ b/lib/models/resources/ResourceRequest.class.php
@@ -1198,9 +1198,12 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
$intervals = $this->getTimeIntervals(false, true);
foreach ($intervals as $interval) {
$room = '';
- $date = call_user_func([$interval['range'], 'find'], $interval['range_id']);
- if ($room_obj = Room::find($date->room_booking->resource_id)) {
- $room = $room_obj->name;
+
+ if ($interval['range'] == 'CourseDate') {
+ $date = call_user_func([$interval['range'], 'find'], $interval['range_id']);
+ if ($room_obj = Room::find($date->room_booking->resource_id)) {
+ $room = $room_obj->name;
+ }
}
$same_day = (date('Ymd', $interval['begin'])
--
GitLab