IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-26 02:40:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Annotations: Fix for annotations not reloaded when switching between 2 dashboards with annotations, Fixes #851

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-09-24 09:03:04 +02:00
parent 0fbace7285
commit 81747e1623
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,7 +1,10 @@
# 1.9.0 (unreleased) # 1.9.0 (unreleased)
# 1.8.1 (unreleased)
**Fixes** **Fixes**
- [Issue #847](https://github.com/grafana/grafana/issues/847). Graph: Fix for series draw order not being the same after hiding/unhiding series - [Issue #847](https://github.com/grafana/grafana/issues/847). Graph: Fix for series draw order not being the same after hiding/unhiding series
- [Issue #851](https://github.com/grafana/grafana/issues/851). Annotations: Fix for annotations not reloaded when switching between 2 dashboards with annotations
# 1.8.0 (2014-09-22) # 1.8.0 (2014-09-22)

3
src/app/services/annotationsSrv.js
View File

@ -13,7 +13,8 @@ define([
var timezone; var timezone;
this.init = function() { this.init = function() {
$rootScope.$on('refresh', this.clearCache); $rootScope.onAppEvent('refresh', this.clearCache);
$rootScope.onAppEvent('setup-dashboard', this.clearCache);
}; };
this.clearCache = function() { this.clearCache = function() {

4
src/app/services/elasticsearch/es-datasource.js
View File

@ -94,6 +94,10 @@ function (angular, _, config, kbn, moment) {
for (var i = 0; i < fieldNames.length; i++) { for (var i = 0; i < fieldNames.length; i++) {
fieldValue = fieldValue[fieldNames[i]]; fieldValue = fieldValue[fieldNames[i]];
if (!fieldValue) {
console.log('could not find field in annotatation: ', fieldName);
return '';
}
} }
if (_.isArray(fieldValue)) { if (_.isArray(fieldValue)) {