From 1a588dadbe1704e75855ccdcb528415f3a528f45 Mon Sep 17 00:00:00 2001 From: Marcus Efraimsson Date: Tue, 5 Mar 2019 20:25:38 +0100 Subject: [PATCH] fix only users that can edit a dashboard should be able to update panel json --- public/app/core/controllers/json_editor_ctrl.ts | 2 +- public/app/features/dashboard/utils/panel.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/public/app/core/controllers/json_editor_ctrl.ts b/public/app/core/controllers/json_editor_ctrl.ts index 7439433c55e..a0384aa8d36 100644 --- a/public/app/core/controllers/json_editor_ctrl.ts +++ b/public/app/core/controllers/json_editor_ctrl.ts @@ -5,7 +5,7 @@ export class JsonEditorCtrl { /** @ngInject */ constructor($scope) { $scope.json = angular.toJson($scope.model.object, true); - $scope.canUpdate = $scope.model.updateHandler !== void 0 && $scope.contextSrv.isEditor; + $scope.canUpdate = $scope.model.updateHandler !== void 0 && $scope.model.canUpdate; $scope.canCopy = $scope.model.enableCopy; $scope.update = () => { diff --git a/public/app/features/dashboard/utils/panel.ts b/public/app/features/dashboard/utils/panel.ts index 0c5d22412f5..d14432cb2eb 100644 --- a/public/app/features/dashboard/utils/panel.ts +++ b/public/app/features/dashboard/utils/panel.ts @@ -70,6 +70,7 @@ export const editPanelJson = (dashboard: DashboardModel, panel: PanelModel) => { updateHandler: (newPanel: PanelModel, oldPanel: PanelModel) => { replacePanel(dashboard, newPanel, oldPanel); }, + canUpdate: dashboard.meta.canEdit, enableCopy: true, };