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

[bugfix] Fixing regression from #4500 (#4549)

This commit is contained in:
John Bodley 2018-03-06 21:19:13 -08:00 committed by Maxime Beauchemin
parent 01e0a2f071
commit ef4e5ecedf
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
superset/viz.py
View File

@ -288,7 +288,7 @@ class BaseViz(object):
df = payload.get('df')
if self.status != utils.QueryStatus.FAILED:
if df is None or df.empty:
if df is not None and df.empty:
payload['error'] = 'No data'
else:
payload['data'] = self.get_data(df)
@ -611,7 +611,7 @@ class MarkupViz(BaseViz):
return None
def get_df(self, query_obj=None):
return pd.DataFrame()
return None
def get_data(self, df):
markup_type = self.form_data.get('markup_type')

11
tests/core_tests.py
View File

@ -922,7 +922,7 @@ class CoreTests(SupersetTestCase):
data = self.get_json_resp(url)
self.assertEqual(data['status'], utils.QueryStatus.SUCCESS)
assert 'No data' in data['error']
self.assertEqual(data['error'], 'No data')
def test_slice_payload_invalid_query(self):
self.login(username='admin')
@ -937,6 +937,15 @@ class CoreTests(SupersetTestCase):
self.assertEqual(data['status'], utils.QueryStatus.FAILED)
assert 'KeyError' in data['stacktrace']
def test_slice_payload_viz_markdown(self):
self.login(username='admin')
slc = self.get_slice('Title', db.session)
url = slc.get_explore_url(base_url='/superset/explore_json')
data = self.get_json_resp(url)
self.assertEqual(data['status'], None)
self.assertEqual(data['error'], None)
if __name__ == '__main__':
unittest.main()