diff --git a/app/views/resources/resource/_standard_properties_display_part.php b/app/views/resources/resource/_standard_properties_display_part.php index 0cf4fb1f40905aa6c35f2d9541a922867671cb36..a3cb51a6d92942f9622ae6de9627870b17ed0173 100644 --- a/app/views/resources/resource/_standard_properties_display_part.php +++ b/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> diff --git a/db/migrations/20210201_step_00349.php b/db/migrations/20210201_step_00349.php index 8db5365be47e088c9dd3ae948a9f06074d75daba..d124622f96d09326a19023985b2d2275e126059f 100644 --- a/db/migrations/20210201_step_00349.php +++ b/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)) { diff --git a/lib/models/resources/ResourceBooking.class.php b/lib/models/resources/ResourceBooking.class.php index 1d531787af5f096519e1f4482927ffa07318ccd5..8c82b3589230cfb5094efd009957ac03e5a588fd 100644 --- a/lib/models/resources/ResourceBooking.class.php +++ b/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