From da025b1bd37d1b8ead5dd5f9cbb2df44b40eb522 Mon Sep 17 00:00:00 2001 From: "grafana-delivery-bot[bot]" <132647405+grafana-delivery-bot[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2024 13:03:43 +0300 Subject: [PATCH] [v11.2.x] Folders: Correctly show new folder button under root folder (#94712) Folders: Correctly show new folder button under root folder (#94687) show new folder button under root folder if nested folders are disabled and user has the right perms (cherry picked from commit 284c2d6f7184e921a522a0af027500e67b6f9b0d) Co-authored-by: Ieva --- public/app/features/browse-dashboards/permissions.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/features/browse-dashboards/permissions.ts b/public/app/features/browse-dashboards/permissions.ts index c70c9ee25ab..0bc18c5a321 100644 --- a/public/app/features/browse-dashboards/permissions.ts +++ b/public/app/features/browse-dashboards/permissions.ts @@ -11,7 +11,7 @@ function checkFolderPermission(action: AccessControlAction, folderDTO?: FolderDT function checkCanCreateFolders(folderDTO?: FolderDTO) { // Can only create a folder if we have permissions and either we're at root or nestedFolders is enabled - if (folderDTO && !config.featureToggles.nestedFolders) { + if (folderDTO && folderDTO.uid !== 'general' && !config.featureToggles.nestedFolders) { return false; }