IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11719 from mtanda/annotation_on_non_editable_dashboard

Browse Source 
create annotation on non-editable dashboard
This commit is contained in:
Daniel Lee 2018-05-16 15:18:32 +02:00 committed by GitHub
commit 574baa7151
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/plugins/panel/graph/graph.ts
View File

@ -674,7 +674,7 @@ function graphDirective(timeSrv, popoverSrv, contextSrv) {
return;
}
if ((ranges.ctrlKey || ranges.metaKey) && dashboard.meta.canEdit) {
if ((ranges.ctrlKey || ranges.metaKey) && (dashboard.meta.canEdit || dashboard.meta.canMakeEditable)) {
// Add annotation
setTimeout(() => {
eventManager.updateTime(ranges.xaxis);
@ -695,7 +695,7 @@ function graphDirective(timeSrv, popoverSrv, contextSrv) {
return;
}
if ((pos.ctrlKey || pos.metaKey) && dashboard.meta.canEdit) {
if ((pos.ctrlKey || pos.metaKey) && (dashboard.meta.canEdit || dashboard.meta.canMakeEditable)) {
// Skip if range selected (added in "plotselected" event handler)
let isRangeSelection = pos.x !== pos.x1;
if (!isRangeSelection) {