Graph: Fix for all series tooltip showing series with all null values when Hide Empty option is enabled, Fixes #1359

This commit is contained in:
Torkel Ödegaard 2015-01-23 11:36:18 +01:00
parent 1508d0ac23
commit c2c81e7e6a
4 changed files with 5 additions and 2 deletions

View File

@ -15,6 +15,7 @@
- [Issue #1345](https://github.com/grafana/grafana/issues/1345). UI: Fixed position of confirm modal when scrolled down
- [Issue #1372](https://github.com/grafana/grafana/issues/1372). Graphite: Fix for nested complex queries, where a query references a query that references another query (ie the #[A-Z] syntax)
- [Issue #1363](https://github.com/grafana/grafana/issues/1363). Templating: Fix to allow custom template variables to contain white space, now only splits on ','
- [Issue #1359](https://github.com/grafana/grafana/issues/1359). Graph: Fix for all series tooltip showing series with all null values when ``Hide Empty`` option is enabled
**Tech**
- [Issue #1311](https://github.com/grafana/grafana/issues/1311). Tech: Updated Font-Awesome from 3.2 to 4.2

View File

@ -82,7 +82,7 @@ function (angular, _, kbn) {
this._updateNonQueryVariable = function(variable) {
// extract options in comma seperated string
variable.options = _.map(variable.query.split(/[,]+/), function(text) {
return { text: text, value: text };
return { text: text.trim(), value: text.trim() };
});
if (variable.type === 'interval') {

View File

@ -71,7 +71,7 @@ function ($) {
for (i = 0; i < seriesList.length; i++) {
series = seriesList[i];
if (!series.data.length) {
if (!series.data.length || (scope.panel.legend.hideEmpty && series.allIsNull)) {
results.push({ hidden: true });
continue;
}

View File

@ -19,6 +19,8 @@ define([
tooltip: {
shared: true
},
legend: {
},
stack: false
};