pt
/
superset
mirror of https://github.com/apache/superset.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4627 from mistercrunch/fix_run_extra 

Move run_extra_queries outsize of BaseViz init
This commit is contained in:
John Bodley 2018-03-16 13:21:57 -07:00 committed by GitHub
parent 93ec76f757 b906fece68
commit 6875868cf6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
superset/viz.py
View File

@ -79,8 +79,7 @@ class BaseViz(object):
self._some_from_cache = False
self._any_cache_key = None
self._any_cached_dttm = None
self.run_extra_queries()
self._extra_chart_data = None
def run_extra_queries(self):
"""Lyfecycle method to use when more than one query is needed
@ -286,6 +285,7 @@ class BaseViz(object):
def get_payload(self, query_obj=None):
"""Returns a payload of metadata and data"""
self.run_extra_queries()
payload = self.get_df_payload(query_obj)
df = payload.get('df')
@ -1119,7 +1119,6 @@ class NVD3TimeSeriesViz(NVD3Viz):
def run_extra_queries(self):
fd = self.form_data
time_compare = fd.get('time_compare')
self.extra_chart_data = None
if time_compare:
query_object = self.query_obj()
delta = utils.parse_human_timedelta(time_compare)
@ -1137,15 +1136,15 @@ class NVD3TimeSeriesViz(NVD3Viz):
if df2 is not None:
df2[DTTM_ALIAS] += delta
df2 = self.process_data(df2)
self.extra_chart_data = self.to_series(
self._extra_chart_data = self.to_series(
df2, classed='superset', title_suffix='---')
def get_data(self, df):
df = self.process_data(df)
chart_data = self.to_series(df)
if self.extra_chart_data:
chart_data += self.extra_chart_data
if self._extra_chart_data:
chart_data += self._extra_chart_data
chart_data = sorted(chart_data, key=lambda x: x['key'])
return chart_data