From 896d17c79a06bf111cfbb7c0346662e50b8cfb96 Mon Sep 17 00:00:00 2001
From: Moritz Strohm <strohm@data-quest.de>
Date: Fri, 2 Sep 2022 08:24:41 +0000
Subject: [PATCH] allow access to resources/export for global resource users,
closes #201
Closes #201
Merge request studip/studip!944
---
app/controllers/resources/export.php | 2 +-
lib/navigation/ResourceNavigation.php | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/app/controllers/resources/export.php b/app/controllers/resources/export.php
index c838f9fa3bf..f64264a8c19 100644
--- a/app/controllers/resources/export.php
+++ b/app/controllers/resources/export.php
@@ -58,7 +58,7 @@ class Resources_ExportController extends AuthenticatedController
if (Navigation::hasItem('/resources/export/select_booking_sources')) {
Navigation::activateItem('/resources/export/select_booking_sources');
}
- if (!ResourceManager::userHasGlobalPermission(User::findCurrent(), 'admin')) {
+ if (!ResourceManager::userHasGlobalPermission(User::findCurrent())) {
throw new AccessDeniedException();
}
diff --git a/lib/navigation/ResourceNavigation.php b/lib/navigation/ResourceNavigation.php
index a81889b7bd5..f1693b47e6b 100644
--- a/lib/navigation/ResourceNavigation.php
+++ b/lib/navigation/ResourceNavigation.php
@@ -216,7 +216,8 @@ class ResourceNavigation extends Navigation
);
$this->addSubNavigation('structure', $sub_navigation);
}
- if ($show_global_admin_actions) {
+
+ if ($user_is_global_resource_user) {
//Export tab:
$export_navigation = new Navigation(
_('Export'),
@@ -245,8 +246,8 @@ class ResourceNavigation extends Navigation
)
);
$export_navigation->addSubNavigation('print_clipboard_rooms', $sub_nav);
-
-
+ }
+ if ($show_global_admin_actions) {
//Mail tab:
$messages_navigation = new Navigation(
--
GitLab