mirror of
https://github.com/apache/superset.git
synced 2024-09-17 11:09:47 -04:00
Merge pull request #4627 from mistercrunch/fix_run_extra
Move run_extra_queries outsize of BaseViz init
This commit is contained in:
commit
6875868cf6
@ -79,8 +79,7 @@ class BaseViz(object):
|
|||||||
self._some_from_cache = False
|
self._some_from_cache = False
|
||||||
self._any_cache_key = None
|
self._any_cache_key = None
|
||||||
self._any_cached_dttm = None
|
self._any_cached_dttm = None
|
||||||
|
self._extra_chart_data = None
|
||||||
self.run_extra_queries()
|
|
||||||
|
|
||||||
def run_extra_queries(self):
|
def run_extra_queries(self):
|
||||||
"""Lyfecycle method to use when more than one query is needed
|
"""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):
|
def get_payload(self, query_obj=None):
|
||||||
"""Returns a payload of metadata and data"""
|
"""Returns a payload of metadata and data"""
|
||||||
|
self.run_extra_queries()
|
||||||
payload = self.get_df_payload(query_obj)
|
payload = self.get_df_payload(query_obj)
|
||||||
|
|
||||||
df = payload.get('df')
|
df = payload.get('df')
|
||||||
@ -1119,7 +1119,6 @@ class NVD3TimeSeriesViz(NVD3Viz):
|
|||||||
def run_extra_queries(self):
|
def run_extra_queries(self):
|
||||||
fd = self.form_data
|
fd = self.form_data
|
||||||
time_compare = fd.get('time_compare')
|
time_compare = fd.get('time_compare')
|
||||||
self.extra_chart_data = None
|
|
||||||
if time_compare:
|
if time_compare:
|
||||||
query_object = self.query_obj()
|
query_object = self.query_obj()
|
||||||
delta = utils.parse_human_timedelta(time_compare)
|
delta = utils.parse_human_timedelta(time_compare)
|
||||||
@ -1137,15 +1136,15 @@ class NVD3TimeSeriesViz(NVD3Viz):
|
|||||||
if df2 is not None:
|
if df2 is not None:
|
||||||
df2[DTTM_ALIAS] += delta
|
df2[DTTM_ALIAS] += delta
|
||||||
df2 = self.process_data(df2)
|
df2 = self.process_data(df2)
|
||||||
self.extra_chart_data = self.to_series(
|
self._extra_chart_data = self.to_series(
|
||||||
df2, classed='superset', title_suffix='---')
|
df2, classed='superset', title_suffix='---')
|
||||||
|
|
||||||
def get_data(self, df):
|
def get_data(self, df):
|
||||||
df = self.process_data(df)
|
df = self.process_data(df)
|
||||||
chart_data = self.to_series(df)
|
chart_data = self.to_series(df)
|
||||||
|
|
||||||
if self.extra_chart_data:
|
if self._extra_chart_data:
|
||||||
chart_data += self.extra_chart_data
|
chart_data += self._extra_chart_data
|
||||||
chart_data = sorted(chart_data, key=lambda x: x['key'])
|
chart_data = sorted(chart_data, key=lambda x: x['key'])
|
||||||
|
|
||||||
return chart_data
|
return chart_data
|
||||||
|
Loading…
Reference in New Issue
Block a user