aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorElmar Ludwig <elmar.ludwig@uni-osnabrueck.de>2022-07-06 12:55:38 +0200
committerElmar Ludwig <elmar.ludwig@uni-osnabrueck.de>2022-07-06 12:55:38 +0200
commitbcafbf91f4ec67a87e384941a5e8ea2f41e1847d (patch)
tree87cda42d0fb6e26cfa6e62db31c2e9d8c547245f /lib
parent48e8d6c1bbce723503a0fb38a77429b4a25e8065 (diff)
Revert "fix #1044"
This reverts commit a9a31a9e6d2e465dcd6f98e50932a17b8dc02278.
Diffstat (limited to 'lib')
-rwxr-xr-xlib/classes/JsonApi/Routes/Courseware/Authority.php12
1 files changed, 3 insertions, 9 deletions
diff --git a/lib/classes/JsonApi/Routes/Courseware/Authority.php b/lib/classes/JsonApi/Routes/Courseware/Authority.php
index 6f192d7..19cb421 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);