From db240265ff45e09b8ea08514d4ecc24b62063f14 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Wed, 4 Aug 2021 13:34:29 +0100 Subject: [PATCH] Catalog: Fix InstallControls for externally managed users (#37531) (#37538) (cherry picked from commit 224b062cac5b5550495cc9b17a8d2a29d9f94e9f) Co-authored-by: Jack Westbrook --- .../features/plugins/admin/components/InstallControls.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/public/app/features/plugins/admin/components/InstallControls.tsx b/public/app/features/plugins/admin/components/InstallControls.tsx index 63ce949cade..1d9d4189486 100644 --- a/public/app/features/plugins/admin/components/InstallControls.tsx +++ b/public/app/features/plugins/admin/components/InstallControls.tsx @@ -94,8 +94,9 @@ export const InstallControls = ({ plugin, isInflight, hasUpdate, isInstalled, ha ); } - if (!hasPermission) { - const message = `You need server admin privileges to ${isInstalled ? 'uninstall' : 'install'} this plugin.`; + if (!hasPermission && !isExternallyManaged) { + const pluginStatus = isInstalled ? 'uninstall' : hasUpdate ? 'update' : 'install'; + const message = `You do not have permission to ${pluginStatus} this plugin.`; return
{message}
; }