pt/superset
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2024-09-17 11:09:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix timestamp error in table view (#1960)

Browse Source
This commit is contained in:
Jun Jiang 2017-01-13 09:05:34 +08:00 committed by Maxime Beauchemin
parent 1dbfb99ead
commit 87eacf88c3
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
superset/views.py
View File

@ -5,7 +5,6 @@ from __future__ import unicode_literals
from datetime import datetime, timedelta
import json
import simplejson
import logging
import pickle
import re
@ -1405,8 +1404,7 @@ class Superset(BaseSupersetView):
status = 500
return Response(
simplejson.dumps(
payload, default=utils.json_int_dttm_ser, ignore_nan=True),
viz_obj.json_dumps(payload),
status=status,
mimetype="application/json")

11
superset/viz.py
View File

@ -379,10 +379,7 @@ class BaseViz(object):
payload['cached_dttm'] = datetime.now().isoformat().split('.')[0]
logging.info("Caching for the next {} seconds".format(
cache_timeout))
data = json.dumps(
payload,
default=utils.json_int_dttm_ser, ignore_nan=True
)
data = self.json_dumps(payload)
if PY3:
data = bytes(data, 'utf-8')
try:
@ -399,6 +396,9 @@ class BaseViz(object):
payload['is_cached'] = is_cached
return payload
def json_dumps(self, obj):
return json.dumps(obj, default=utils.json_int_dttm_ser, ignore_nan=True)
@property
def data(self):
"""This is the data object serialized to the js layer"""
@ -538,6 +538,9 @@ class TableViz(BaseViz):
columns=list(df.columns),
)
def json_dumps(self, obj):
return json.dumps(obj, default=utils.json_iso_dttm_ser)
class PivotTableViz(BaseViz):