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

annotation snapshot fix

Browse Source
This commit is contained in:
Mitsuhiro Tanda 2016-01-11 19:17:25 +09:00
parent 012d1378d4
commit d3bc52278d
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/features/annotations/annotationsSrv.js
View File

@ -46,9 +46,9 @@ define([
var query = {range: range, rangeRaw: rangeRaw, annotation: annotation}; var query = {range: range, rangeRaw: rangeRaw, annotation: annotation};
return datasource.annotationQuery(query) return datasource.annotationQuery(query)
.then(self.receiveAnnotationResults) .then(self.receiveAnnotationResults)
.then(function(options) { .then(function(results) {
if (dashboard.snapshot) { if (dashboard.snapshot) {
annotation.snapshotData = angular.copy(options); annotation.snapshotData = angular.copy(results);
} }
}) })
.then(null, errorHandler); .then(null, errorHandler);

8
public/app/features/dashboard/shareSnapshotCtrl.js
View File

@ -102,13 +102,17 @@ function (angular, _) {
panel.datasource = null; panel.datasource = null;
}); });
// remove annotation queries // remove annotation queries
dash.annotations.list = _.map(dash.annotations.list, function(annotation) { dash.annotations.list = _.chain(dash.annotations.list)
.filter(function(annotation) {
return annotation.enable;
})
.map(function(annotation) {
return { return {
name: annotation.name, name: annotation.name,
enable: annotation.enable, enable: annotation.enable,
snapshotData: annotation.snapshotData snapshotData: annotation.snapshotData
}; };
}); }).value();
// remove template queries // remove template queries
_.each(dash.templating.list, function(variable) { _.each(dash.templating.list, function(variable) {
variable.query = ""; variable.query = "";