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 #15100 from grafana/annotation-dashboard-switch-fix

Browse Source 
Fix for annotations not clearing when switching dashboards
This commit is contained in:
Torkel Ödegaard
2019-01-29 06:53:20 +01:00
committed by GitHub
parent c1d778c704 c3c8cd3f4d
commit 459a93da10
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/app/features/annotations/annotations_srv.ts
View File

@@ -21,12 +21,16 @@ export class AnnotationsSrv {
constructor(private $rootScope, private $q, private datasourceSrv, private backendSrv, private timeSrv) {} constructor(private $rootScope, private $q, private datasourceSrv, private backendSrv, private timeSrv) {}
init(dashboard: DashboardModel) { init(dashboard: DashboardModel) {
// always clearPromiseCaches when loading new dashboard
this.clearPromiseCaches();
// clear promises on refresh events // clear promises on refresh events
dashboard.on('refresh', () => { dashboard.on('refresh', this.clearPromiseCaches.bind(this));
this.globalAnnotationsPromise = null; }
this.alertStatesPromise = null;
this.datasourcePromises = null; clearPromiseCaches() {
}); this.globalAnnotationsPromise = null;
this.alertStatesPromise = null;
this.datasourcePromises = null;
} }
getAnnotations(options) { getAnnotations(options) {