diff --git a/app/controllers/resources/export.php b/app/controllers/resources/export.php index c838f9fa3bf68d28c71c8752f85e2379dd0df534..f64264a8c1985c904af86f30774651559d7f2a17 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 a81889b7bd576fad50f2d1a7040c987e7af7d64e..f1693b47e6bbc1a2615cfd8d5eb8e458273e2167 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(