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

Fixes to edit view switching, and to templateValuesSrv

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-02-28 10:29:17 +01:00
parent dcfad7d61b
commit 4a72c37fc1
3 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/directives/dashEditLink.js
View File

@ -107,7 +107,9 @@ function (angular, $) {
showEditorPane(null, {}, newValue); showEditorPane(null, {}, newValue);
} else if (oldValue) { } else if (oldValue) {
scope.contextSrv.editview = null; scope.contextSrv.editview = null;
hideEditorPane(); if (lastEditor === editViewMap[oldValue]) {
hideEditorPane();
}
} }
}); });

15
src/app/features/annotations/annotationsSrv.js
View File

@ -12,6 +12,7 @@ define([
var promiseCached; var promiseCached;
var list = []; var list = [];
var timezone; var timezone;
var self = this;
this.init = function() { this.init = function() {
$rootScope.onAppEvent('refresh', this.clearCache); $rootScope.onAppEvent('refresh', this.clearCache);
@ -33,15 +34,15 @@ define([
} }
timezone = dashboard.timezone; timezone = dashboard.timezone;
var annotations = _.where(dashboard.annotations.list, { enable: true }); var annotations = _.where(dashboard.annotations.list, {enable: true});
var promises = _.map(annotations, function(annotation) { var promises = _.map(annotations, function(annotation) {
var datasource = datasourceSrv.get(annotation.datasource); return datasourceSrv.get(annotation.datasource).then(function(datasource) {
return datasource.annotationQuery(annotation, rangeUnparsed)
return datasource.annotationQuery(annotation, rangeUnparsed) .then(self.receiveAnnotationResults)
.then(this.receiveAnnotationResults) .then(null, errorHandler);
.then(null, errorHandler); }, this);
}, this); });
promiseCached = $q.all(promises) promiseCached = $q.all(promises)
.then(function() { .then(function() {

32
src/app/features/templating/templateValuesSrv.js
View File

@ -97,9 +97,8 @@ function (angular, _, kbn) {
return $q.when([]); return $q.when([]);
} }
var datasource = datasourceSrv.get(variable.datasource); return datasourceSrv.get(variable.datasource).then(function(datasource) {
return datasource.metricFindQuery(variable.query) return datasource.metricFindQuery(variable.query).then(function (results) {
.then(function (results) {
variable.options = self.metricNamesToVariableValues(variable, results); variable.options = self.metricNamesToVariableValues(variable, results);
if (variable.includeAll) { if (variable.includeAll) {
@ -117,6 +116,7 @@ function (angular, _, kbn) {
return self.setVariableValue(variable, variable.options[0], true); return self.setVariableValue(variable, variable.options[0], true);
}); });
});
}; };
this.metricNamesToVariableValues = function(variable, metricNames) { this.metricNamesToVariableValues = function(variable, metricNames) {
@ -149,19 +149,19 @@ function (angular, _, kbn) {
this.addAllOption = function(variable) { this.addAllOption = function(variable) {
var allValue = ''; var allValue = '';
switch(variable.allFormat) { switch(variable.allFormat) {
case 'wildcard': case 'wildcard':
allValue = '*'; allValue = '*';
break; break;
case 'regex wildcard': case 'regex wildcard':
allValue = '.*'; allValue = '.*';
break; break;
case 'regex values': case 'regex values':
allValue = '(' + _.pluck(variable.options, 'text').join('|') + ')'; allValue = '(' + _.pluck(variable.options, 'text').join('|') + ')';
break; break;
default: default:
allValue = '{'; allValue = '{';
allValue += _.pluck(variable.options, 'text').join(','); allValue += _.pluck(variable.options, 'text').join(',');
allValue += '}'; allValue += '}';
} }
variable.options.unshift({text: 'All', value: allValue}); variable.options.unshift({text: 'All', value: allValue});