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

This commit is contained in:
Torkel Ödegaard 2015-12-04 15:45:06 +01:00
commit 700a3f9f84

View File

@ -129,7 +129,7 @@ function (angular, _) {
.pluck('Dimensions') .pluck('Dimensions')
.flatten() .flatten()
.filter(function(dimension) { .filter(function(dimension) {
return dimension.Name === dimensionKey; return dimension !== null && dimension.Name === dimensionKey;
}) })
.pluck('Value') .pluck('Value')
.uniq() .uniq()