From f0385bd696df48bb1a0cd4c0271e0485360bf56d Mon Sep 17 00:00:00 2001
From: noackorama <noackorama@gmail.com>
Date: Tue, 3 Aug 2021 15:12:16 +0200
Subject: [PATCH] fix #34
---
app/views/course/room_requests/index.php | 25 ++++++------------------
1 file changed, 6 insertions(+), 19 deletions(-)
diff --git a/app/views/course/room_requests/index.php b/app/views/course/room_requests/index.php
index 5043e873597..e8b94dc7f2b 100644
--- a/app/views/course/room_requests/index.php
+++ b/app/views/course/room_requests/index.php
@@ -66,24 +66,11 @@ echo $flash['message'];
) ?>
<?php
- $user_has_permissions = false;
- if ($rr->room && !$GLOBALS['perm']->have_perm('root')) {
- $user_has_permissions = (
- $rr->room->userHasPermission($current_user, 'admin') &&
- (RoomRequest::countBySql(
- "id = :request_id
- AND closed = '0'
- AND user_id = :user_id",
- [
- 'request_id' => $rr->id,
- 'user_id' => $current_user->id
- ]
- ) > 0
- )
- );
- } else {
- $user_has_permissions = ResourceManager::userHasGlobalPermission($current_user, 'admin');
- } ?>
+ $user_has_permissions = ResourceManager::userHasGlobalPermission($current_user, 'admin');
+ if ($rr->room && !$user_has_permissions) {
+ $user_has_permissions = $rr->room->userHasPermission($current_user, 'admin');
+ }
+ ?>
<? if ($user_has_permissions && (int)$rr->closed === 0): ?>
<? $actionMenu->addLink(
@@ -141,4 +128,4 @@ echo $flash['message'];
['data-dialog' => 'size=big']
) ?>
</div>
-<? endif ?>
\ No newline at end of file
+<? endif ?>
--
GitLab