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 branch 'query-editor-breakout'

Browse Source 
Conflicts:
	CHANGELOG.md
This commit is contained in:
Torkel Ödegaard
2015-08-18 08:23:13 +02:00
parent af39e4de3e d4432ddd64
commit 9a9c9b2b12
53 changed files with 1704 additions and 1386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/features/templating/editorCtrl.js
View File

@@ -23,7 +23,10 @@ function (angular, _) {
$scope.init = function() {
$scope.editor = { index: 0 };
$scope.datasources = datasourceSrv.getMetricSources();
$scope.datasources = _.filter(datasourceSrv.getMetricSources(), function(ds) {
return !ds.meta.builtIn;
});
$scope.variables = templateSrv.variables;
$scope.reset();