Merge branch 'main' of gitlab.studip.de:studip/studip

app/views/resources/resource/_standard_properties_display_part.php

@@ -23,10 +23,6 @@
             </header>
 
             <table class="default">
-                <colgroup>
-                    <col style="width: 70%">
-                    <col>
-                </colgroup>
                 <thead>
                     <tr>
                         <th>

db/migrations/20210201_step_00349.php

@@ -210,7 +210,7 @@ class Step00349 extends Migration
             }
         }
 
-        $db->exec("DELETE FROM `object_user_visits` WHERE `type` IN ('literature', 'forum')");
+        $db->exec("DELETE FROM `object_user_visits` WHERE `type` IN ('literature', 'forum', '')");
         $db->exec("ALTER TABLE `object_user_visits` ADD `plugin_id` INT NOT NULL AFTER `type`");
         foreach ($ouv_mapping as $type => $plugin_id) {
             if (is_string($plugin_id)) {

lib/models/resources/ResourceBooking.class.php

@@ -125,7 +125,7 @@ class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calen
             StudipLog::log(
                 'RES_ASSIGN_SEM',
                 $this->resource_id,
-                $this->range_id,
+                $this->course_id,
                 $this->__toString(),
                 null,
                 $GLOBALS['user']->id
@@ -149,7 +149,7 @@ class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calen
             StudipLog::log(
                 'RES_ASSIGN_DEL_SEM',
                 $this->resource_id,
-                $this->range_id,
+                $this->course_id,
                 $this->__toString(),
                 null,
                 $GLOBALS['user']->id