From f2d9f928042df613a0785441d6824119e83c7990 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Till=20Gl=C3=B6ggler?= <till@gundk.it>
Date: Fri, 1 Oct 2021 14:29:27 +0200
Subject: [PATCH] fixes #186, do not check for locks if user has admin perms
---
lib/models/resources/Resource.class.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/models/resources/Resource.class.php b/lib/models/resources/Resource.class.php
index c5cc4447b09..2b5de69df02 100644
--- a/lib/models/resources/Resource.class.php
+++ b/lib/models/resources/Resource.class.php
@@ -1465,7 +1465,7 @@ class Resource extends SimpleORMap implements StudipItem
public function getInfolabelPrperties()
{
return SimpleCollection::createFromArray(
- ResourceProperty::findBySQL('INNER JOIN `resource_property_definitions` USING (`property_id`)
+ ResourceProperty::findBySQL('INNER JOIN `resource_property_definitions` USING (`property_id`)
WHERE `info_label` = 1 AND `state` != "" AND `resource_id` = ?', [$this->id]
)
);
@@ -2435,7 +2435,7 @@ class Resource extends SimpleORMap implements StudipItem
return false;
}
} elseif ($permission === 'autor') {
- if (GlobalResourceLock::currentlyLocked()) {
+ if ($perm_level != 'admin' && GlobalResourceLock::currentlyLocked()) {
//A global resource lock means no writing actions are permitted.
return false;
}
@@ -2445,7 +2445,7 @@ class Resource extends SimpleORMap implements StudipItem
return false;
}
} elseif ($permission === 'tutor') {
- if (GlobalResourceLock::currentlyLocked()) {
+ if ($perm_level != 'admin' && GlobalResourceLock::currentlyLocked()) {
//A global resource lock means no writing actions are permitted.
return false;
}
--
GitLab