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

Filtering: Fix for nested filters, changing a child filter could result in infinite recursion in some cases, Fixes #628

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-08-01 08:54:22 +02:00
parent 67582aaee4
commit 867186fd66
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -24,6 +24,7 @@
**Fixes** **Fixes**
- [Issue #545](https://github.com/grafana/grafana/issues/545). Chart: Fix formatting negative values (axis formats, legend values) - [Issue #545](https://github.com/grafana/grafana/issues/545). Chart: Fix formatting negative values (axis formats, legend values)
- [Issue #460](https://github.com/grafana/grafana/issues/460). Chart: fix for max legend value when max value is zero - [Issue #460](https://github.com/grafana/grafana/issues/460). Chart: fix for max legend value when max value is zero
- [Issue #628](https://github.com/grafana/grafana/issues/628). Filtering: Fix for nested filters, changing a child filter could result in infinite recursion in some cases
# 1.6.1 (2014-06-24) # 1.6.1 (2014-06-24)

2
src/app/panels/filtering/module.js
View File

@ -53,7 +53,7 @@ function (angular, app, _) {
if (templateParam === updatedTemplatedParam) { if (templateParam === updatedTemplatedParam) {
return; return;
} }
if (templateParam.query.indexOf(updatedTemplatedParam.name) !== -1) { if (templateParam.query.indexOf('[[' + updatedTemplatedParam.name + ']]') !== -1) {
return $scope.applyFilter(templateParam); return $scope.applyFilter(templateParam);
} }
}); });