[kibble] branch master updated: missing sub-filtering here, plus refactor of view filter

[hu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

humbedooh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kibble.git


The following commit(s) were added to refs/heads/master by this push:
     new b020811  missing sub-filtering here, plus refactor of view filter
b020811 is described below

commit b02081116211871292693ed08463bec851fa526c
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Mon Oct 23 00:16:59 2017 +0200

    missing sub-filtering here, plus refactor of view filter
---
 api/pages/mail/pony-timeseries.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/api/pages/mail/pony-timeseries.py b/api/pages/mail/pony-timeseries.py
index 9e0e34d..4a8bbf8 100644
--- a/api/pages/mail/pony-timeseries.py
+++ b/api/pages/mail/pony-timeseries.py
@@ -84,9 +84,9 @@ def run(API, environ, indata, session):
     # First, fetch the view if we have such a thing enabled
     viewList = []
     if indata.get('view'):
-        if session.DB.ES.exists(index=session.DB.dbname, doc_type="view", id = indata['view']):
-            view = session.DB.ES.get(index=session.DB.dbname, doc_type="view", id = indata['view'])
-            viewList = view['_source']['sourceList']
+        viewList = session.getView(indata.get('view'))
+    if indata.get('subfilter'):
+        viewList = session.subFilter(indata.get('subfilter'), view = viewList) 
     
     hl = indata.get('span', 24)
     tnow = datetime.date.today()

-- 
To stop receiving notification emails like this one, please contact
['"commits@kibble.apache.org" <co...@kibble.apache.org>'].