From e227c24877b7d510d5aa5bb7ed1e1dca00454a35 Mon Sep 17 00:00:00 2001 From: "grafana-delivery-bot[bot]" <132647405+grafana-delivery-bot[bot]@users.noreply.github.com> Date: Thu, 28 Mar 2024 17:01:45 +0100 Subject: [PATCH] [v11.0.x] DashboardScene: Fix access to dashboard settings views (#85371) DashboardScene: Fix access to dashboard settings views (#85289) * DashboardScene: Fix access to dashboard settings views * Review (cherry picked from commit 63a941472ef32656d3e6149a2779c860cbceb5a3) Co-authored-by: Dominik Prokop --- .../scene/NavToolbarActions.tsx | 2 +- .../dashboard-scene/settings/utils.ts | 94 +++++++++++-------- 2 files changed, 58 insertions(+), 38 deletions(-) diff --git a/public/app/features/dashboard-scene/scene/NavToolbarActions.tsx b/public/app/features/dashboard-scene/scene/NavToolbarActions.tsx index 4be544ba1ec..3e7d396372b 100644 --- a/public/app/features/dashboard-scene/scene/NavToolbarActions.tsx +++ b/public/app/features/dashboard-scene/scene/NavToolbarActions.tsx @@ -432,7 +432,7 @@ export function ToolbarActions({ dashboard }: Props) { } // If we only can save as copy - if (canSaveAs && !meta.canSave) { + if (canSaveAs && !meta.canSave && !meta.canMakeEditable) { return (