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

Improve the bool filter construction in filterSrv

Browse Source
This commit is contained in:
Boaz Leskes 2013-11-14 16:50:55 +01:00
parent 2e7a2d7410
commit 30cda20e2e
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/app/services/filterSrv.js
View File

@ -129,25 +129,32 @@ define([
};
this.getBoolFilter = function(ids) {
// A default match all filter, just in case there are no other filters
var bool = ejs.BoolFilter().must(ejs.MatchAllFilter());
var either_bool = ejs.BoolFilter().must(ejs.MatchAllFilter());
var bool = ejs.BoolFilter();
// there is no way to introspect the BoolFilter and find out if it has a filter. We must keep note.
var added_a_filter = false;
_.each(ids,function(id) {
if(self.list[id].active) {
added_a_filter = true;
switch(self.list[id].mandate)
{
case 'mustNot':
bool = bool.mustNot(self.getEjsObj(id));
bool.mustNot(self.getEjsObj(id));
break;
case 'either':
either_bool = either_bool.should(self.getEjsObj(id));
bool.should(self.getEjsObj(id));
break;
default:
bool = bool.must(self.getEjsObj(id));
bool.must(self.getEjsObj(id));
}
}
});
return bool.must(either_bool);
// add a match filter so we'd get some data
if (!added_a_filter) {
bool.must(ejs.MatchAllFilter());
}
return bool;
};
this.getEjsObj = function(id) {