Skip to content
Snippets Groups Projects
Unverified Commit f2d9f928 authored by Till Glöggler's avatar Till Glöggler
Browse files

fixes #186, do not check for locks if user has admin perms

parent c1beea87
No related branches found
No related tags found
No related merge requests found
...@@ -1465,7 +1465,7 @@ class Resource extends SimpleORMap implements StudipItem ...@@ -1465,7 +1465,7 @@ class Resource extends SimpleORMap implements StudipItem
public function getInfolabelPrperties() public function getInfolabelPrperties()
{ {
return SimpleCollection::createFromArray( 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] WHERE `info_label` = 1 AND `state` != "" AND `resource_id` = ?', [$this->id]
) )
); );
...@@ -2435,7 +2435,7 @@ class Resource extends SimpleORMap implements StudipItem ...@@ -2435,7 +2435,7 @@ class Resource extends SimpleORMap implements StudipItem
return false; return false;
} }
} elseif ($permission === 'autor') { } elseif ($permission === 'autor') {
if (GlobalResourceLock::currentlyLocked()) { if ($perm_level != 'admin' && GlobalResourceLock::currentlyLocked()) {
//A global resource lock means no writing actions are permitted. //A global resource lock means no writing actions are permitted.
return false; return false;
} }
...@@ -2445,7 +2445,7 @@ class Resource extends SimpleORMap implements StudipItem ...@@ -2445,7 +2445,7 @@ class Resource extends SimpleORMap implements StudipItem
return false; return false;
} }
} elseif ($permission === 'tutor') { } elseif ($permission === 'tutor') {
if (GlobalResourceLock::currentlyLocked()) { if ($perm_level != 'admin' && GlobalResourceLock::currentlyLocked()) {
//A global resource lock means no writing actions are permitted. //A global resource lock means no writing actions are permitted.
return false; return false;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment