Skip to content
Snippets Groups Projects
Verified Commit b7534a3d authored by Till Glöggler's avatar Till Glöggler
Browse files

fixes #284, fix regression

parent c797a2bc
No related branches found
No related tags found
No related merge requests found
...@@ -1198,9 +1198,12 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen ...@@ -1198,9 +1198,12 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
$intervals = $this->getTimeIntervals(false, true); $intervals = $this->getTimeIntervals(false, true);
foreach ($intervals as $interval) { foreach ($intervals as $interval) {
$room = ''; $room = '';
$date = call_user_func([$interval['range'], 'find'], $interval['range_id']);
if ($room_obj = Room::find($date->room_booking->resource_id)) { if ($interval['range'] == 'CourseDate') {
$room = $room_obj->name; $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']) $same_day = (date('Ymd', $interval['begin'])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment