From eae2953d59106c9a6a790d802475d84085fedcd2 Mon Sep 17 00:00:00 2001
From: Elmar Ludwig <elmar.ludwig@uni-osnabrueck.de>
Date: Tue, 15 Nov 2022 12:22:46 +0000
Subject: [PATCH] remove some unneeded code, re #1339
Merge request studip/studip!867
---
app/controllers/room_management/overview.php | 39 +++++++-------------
app/views/resources/_common/_resource_tr.php | 12 +-----
2 files changed, 15 insertions(+), 36 deletions(-)
diff --git a/app/controllers/room_management/overview.php b/app/controllers/room_management/overview.php
index aecf600664f..2b3022cb3f5 100644
--- a/app/controllers/room_management/overview.php
+++ b/app/controllers/room_management/overview.php
@@ -37,33 +37,22 @@ class RoomManagement_OverviewController extends AuthenticatedController
}
parent::before_filter($action, $args);
$this->user = User::findCurrent();
+ $this->user_is_root = $GLOBALS['perm']->have_perm('root');
+ $this->user_is_global_resource_user = ResourceManager::userHasGlobalPermission($this->user);
+ $this->user_is_global_resource_admin = ResourceManager::userHasGlobalPermission($this->user, 'admin');
- if ($this->user) {
- $this->show_resource_actions = (
- ResourceManager::userHasGlobalPermission($this->user, 'autor')
- ||
- ResourceManager::userHasResourcePermissions($this->user, 'autor')
- );
+ $this->show_resource_actions = (
+ ResourceManager::userHasGlobalPermission($this->user, 'autor')
+ ||
+ ResourceManager::userHasResourcePermissions($this->user, 'autor')
+ );
+ $this->show_admin_actions = (
+ $this->user_is_global_resource_admin
+ ||
+ ResourceManager::userHasResourcePermissions($this->user)
+ );
+ $this->show_global_admin_actions = $this->user_is_global_resource_admin;
- $this->show_admin_actions = (
- $this->user_is_global_resource_admin
- ||
- ResourceManager::userHasResourcePermissions($this->user)
- ||
- $GLOBALS['perm']->have_perm('root')
- );
- $this->user_is_global_resource_user = ResourceManager::userHasGlobalPermission($this->user);
- $this->user_is_root = $GLOBALS['perm']->have_perm('root');
- $this->user_is_global_resource_admin = ResourceManager::userHasGlobalPermission(
- $this->user,
- 'admin'
- ) || $this->user_is_root;
- $this->show_global_admin_actions = $this->user_is_global_resource_admin
- && ResourceManager::userHasGlobalPermission(
- $this->user,
- 'admin'
- );
- }
}
public function index_action()
diff --git a/app/views/resources/_common/_resource_tr.php b/app/views/resources/_common/_resource_tr.php
index 839e112061f..ccd7847a8f5 100644
--- a/app/views/resources/_common/_resource_tr.php
+++ b/app/views/resources/_common/_resource_tr.php
@@ -153,17 +153,7 @@
|| $show_tutor_actions || $show_admin_actions
|| $show_global_admin_actions || $additional_actions): ?>
<td class="actions">
- <?= $this->render_partial('resources/_common/_action_menu.php',
- compact(
- 'show_user_actions',
- 'show_autor_actions',
- 'show_autor_actions',
- 'show_admin_actions',
- 'show_global_admin_actions',
- 'additional_actions',
- 'resource'
- )
- );?>
+ <?= $this->render_partial('resources/_common/_action_menu.php') ?>
</td>
<? endif ?>
</tr>
--
GitLab