Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
af5b97eb
Commit
af5b97eb
authored
Nov 19, 2013
by
Rashid Khan
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'bleskes/feature/improve_bool_filter' into boazFilter
parents
a926358a
30cda20e
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
7 deletions
+14
-7
src/app/services/filterSrv.js
+14
-7
No files found.
src/app/services/filterSrv.js
View file @
af5b97eb
...
...
@@ -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
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment