From bcafbf91f4ec67a87e384941a5e8ea2f41e1847d Mon Sep 17 00:00:00 2001
From: Elmar Ludwig <elmar.ludwig@uni-osnabrueck.de>
Date: Wed, 6 Jul 2022 12:55:38 +0200
Subject: [PATCH] Revert "fix #1044"
This reverts commit a9a31a9e6d2e465dcd6f98e50932a17b8dc02278.
---
lib/classes/JsonApi/Routes/Courseware/Authority.php | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/lib/classes/JsonApi/Routes/Courseware/Authority.php b/lib/classes/JsonApi/Routes/Courseware/Authority.php
index 6f192d7d451..19cb4211a8d 100755
--- a/lib/classes/JsonApi/Routes/Courseware/Authority.php
+++ b/lib/classes/JsonApi/Routes/Courseware/Authority.php
@@ -59,19 +59,13 @@ class Authority
public static function canUpdateBlock(User $user, Block $resource)
{
if ($resource->isBlocked()) {
- $structural_element = $resource->container->structural_element;
-
- if ($structural_element->range_type === 'user') {
- return $structural_element->range_id === $user->id;
- }
-
$perm = $GLOBALS['perm']->have_studip_perm(
- $structural_element->course->config->COURSEWARE_EDITING_PERMISSION,
- $structural_element->course->id,
+ $resource->container->structural_element->course->config->COURSEWARE_EDITING_PERMISSION,
+ $resource->container->structural_element->course->id,
$user->id
);
- return $resource->edit_blocker_id === $user->id || $perm;
+ return $resource->getBlockerUserId() == $user->id || $perm;
}
return self::canUpdateContainer($user, $resource->container);
--
GitLab