Merge branch 'master' of github.com:grafana/grafana

This commit is contained in:
Torkel Ödegaard 2017-03-20 16:05:13 +01:00
commit c1c241698a

View File

@ -77,6 +77,11 @@ export class VariableEditorCtrl {
return false;
}
if ($scope.current.type === 'query' && $scope.current.query.match(new RegExp('\\$' + $scope.current.name))) {
$scope.appEvent('alert-warning', ['Validation', 'Query contains variable self-reference']);
return false;
}
return true;
};