iop
/
superset
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Miscvizcleanups (#3476) 

* viz: remove unused countries import

* viz: simplify code in BaseViz.query_obj
This commit is contained in:
Riccardo Magliocchetti 2017-09-18 18:44:19 +02:00 committed by Maxime Beauchemin
parent e22aecb0d1
commit b0d25a154a
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
superset/viz.py
View File

@ -167,13 +167,11 @@ class BaseViz(object):
extras = {
'where': form_data.get("where", ''),
'having': form_data.get("having", ''),
'having_druid': form_data.get('having_filters') \
if 'having_filters' in form_data else [],
'having_druid': form_data.get('having_filters', []),
'time_grain_sqla': form_data.get("time_grain_sqla", ''),
'druid_time_origin': form_data.get("druid_time_origin", ''),
}
filters = form_data['filters'] if 'filters' in form_data \
else []
filters = form_data.get('filters', [])
for col, vals in self.get_extra_filters().items():
if not (col and vals) or col.startswith('__'):
continue
@ -1315,7 +1313,6 @@ class CountryMapViz(BaseViz):
return qry
def get_data(self, df):
from superset.data import countries
fd = self.form_data
cols = [fd.get('entity')]
metric = fd.get('metric')