fixes #3547

Closes #3547

Merge request studip/studip!2436

app/controllers/admin/statusgroups.php

@@ -354,13 +354,10 @@ class Admin_StatusgroupsController extends AuthenticatedController
      */
     private function setType()
     {
-
-        if (get_object_type(Context::getId(), ['inst', 'fak'])) {
-            $type = 'inst';
-        }
+        $type = Context::isInstitute() ? 'inst' : null;
         $types = $this->types();
 
-        if (!$type || Request::submitted('type') && $type != Request::get('type')) {
+        if (!$type || Request::submitted('type') && $type !== Request::get('type')) {
             $types[Request::get('type', 'inst')]['redirect']();
         } else {
             $this->type = $types[$type];

lib/models/resources/ResourceRequest.class.php

@@ -1187,10 +1187,10 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
                 if ($with_range) {
                     $date = CourseDate::find($appointment->appointment_id);
 
-                    $interval['range']       = 'ResourceRequestAppointment';
+                    $interval['range']       = ResourceRequestAppointment::class;
                     $interval['range_id']    = $appointment->appointment_id;
-                    $interval['booked_room'] = $date->room_booking->resource_id;
-                    $interval['booking_id']  = $date->room_booking->id;
+                    $interval['booked_room'] = $date->room_booking ? $date->room_booking->resource_id : null;
+                    $interval['booking_id']  = $date->room_booking ? $date->room_booking->id : null;
 
                 }
                 $time_intervals[] = $interval;
@@ -1212,7 +1212,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
                 ];
             }
             if ($with_range) {
-                $interval['range']       = 'CourseDate';
+                $interval['range']       = CourseDate::class;
                 $interval['range_id']    = $this->termin_id;
                 $interval['booked_room'] = $this->date->room_booking ? $this->date->room_booking->resource_id: null;
                 $interval['booking_id']  = $this->date->room_booking ? $this->date->room_booking->id : null;
@@ -1236,7 +1236,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
                     ];
                 }
                 if ($with_range) {
-                    $interval['range']       = 'CourseDate';
+                    $interval['range']       = CourseDate::class;
                     $interval['range_id']    = $date->id;
                     $interval['booked_room'] = $date->room_booking->resource_id;
                     $interval['booking_id']  = $date->room_booking->id;
@@ -1263,10 +1263,10 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
                         ];
                     }
                     if ($with_range) {
-                        $interval['range']       = 'CourseDate';
+                        $interval['range']       = CourseDate::class;
                         $interval['range_id']    = $date->id;
-                        $interval['booked_room'] = $date->room_booking->resource_id;
-                        $interval['booking_id']  = $date->room_booking->id;
+                        $interval['booked_room'] = $date->room_booking ? $date->room_booking->resource_id: null;
+                        $interval['booking_id']  = $date->room_booking ? $date->room_booking->id : null;
                     }
                     $time_intervals[] = $interval;
                 }

templates/widgets/widget-layout.php

 <div class="<?= $base_class ?>-widget <?= htmlReady(implode(' ', $layout_css_classes ?? [])) ?>">
-<? if ($title): ?>
+<? if (!empty($title)): ?>
     <div class="<?= $base_class ?>-widget-header">
         <?= htmlReady($title) ?>
     </div>