diff --git a/public/app/features/browse-dashboards/permissions.ts b/public/app/features/browse-dashboards/permissions.ts index c70c9ee25ab..d4043434bce 100644 --- a/public/app/features/browse-dashboards/permissions.ts +++ b/public/app/features/browse-dashboards/permissions.ts @@ -3,10 +3,7 @@ import { contextSrv } from 'app/core/core'; import { AccessControlAction, FolderDTO } from 'app/types'; function checkFolderPermission(action: AccessControlAction, folderDTO?: FolderDTO) { - // Only some permissions are assigned in the root folder (aka "general" folder), so we can ignore them in most cases - return folderDTO && folderDTO.uid !== 'general' - ? contextSrv.hasPermissionInMetadata(action, folderDTO) - : contextSrv.hasPermission(action); + return folderDTO ? contextSrv.hasPermissionInMetadata(action, folderDTO) : contextSrv.hasPermission(action); } function checkCanCreateFolders(folderDTO?: FolderDTO) { @@ -25,9 +22,7 @@ function checkCanCreateFolders(folderDTO?: FolderDTO) { ); } - return folderDTO - ? contextSrv.hasPermissionInMetadata(AccessControlAction.FoldersCreate, folderDTO) - : contextSrv.hasPermission(AccessControlAction.FoldersCreate); + return checkFolderPermission(AccessControlAction.FoldersCreate, folderDTO); } export function getFolderPermissions(folderDTO?: FolderDTO) {