Fixing json issues (#602)
This commit is contained in:
Maxime Beauchemin
GitHub
parent
327fceefb7
commit
c490138afe
|
|
@ -16,7 +16,11 @@ function nvd3Vis(slice) {
|
|||
d3.json(slice.jsonEndpoint(), function (error, payload) {
|
||||
slice.container.html('');
|
||||
if (error) {
|
||||
slice.error(error.responseText);
|
||||
if (error.responseText) {
|
||||
slice.error(error.responseText);
|
||||
} else {
|
||||
slice.error(error);
|
||||
}
|
||||
return '';
|
||||
}
|
||||
var fd = payload.form_data;
|
||||
|
|
|
|||
|
|
@ -382,75 +382,68 @@ def load_world_bank_health_n_pop():
|
|||
dash = Dash()
|
||||
js = textwrap.dedent("""\
|
||||
[
|
||||
{
|
||||
"size_y": 4,
|
||||
"size_x": 2,
|
||||
"col": 9,
|
||||
"slice_id": "605",
|
||||
"row": 6
|
||||
},
|
||||
{
|
||||
"size_y": 4,
|
||||
"size_x": 2,
|
||||
"col": 11,
|
||||
"slice_id": "606",
|
||||
"row": 6
|
||||
},
|
||||
{
|
||||
"size_y": 2,
|
||||
"size_x": 3,
|
||||
"col": 10,
|
||||
"slice_id": "22",
|
||||
"row": 1
|
||||
"size_x": 2,
|
||||
"col": 1,
|
||||
"slice_id": "607",
|
||||
"row": 0
|
||||
},
|
||||
{
|
||||
"size_y": 2,
|
||||
"size_x": 2,
|
||||
"col": 3,
|
||||
"slice_id": "608",
|
||||
"row": 0
|
||||
},
|
||||
{
|
||||
"size_y": 3,
|
||||
"size_x": 3,
|
||||
"col": 10,
|
||||
"slice_id": "23",
|
||||
"size_x": 8,
|
||||
"col": 5,
|
||||
"slice_id": "609",
|
||||
"row": 3
|
||||
},
|
||||
{
|
||||
"size_y": 8,
|
||||
"size_x": 3,
|
||||
"size_y": 4,
|
||||
"size_x": 8,
|
||||
"col": 1,
|
||||
"slice_id": "24",
|
||||
"row": 1
|
||||
},
|
||||
{
|
||||
"size_y": 3,
|
||||
"size_x": 6,
|
||||
"col": 4,
|
||||
"slice_id": "25",
|
||||
"slice_id": "610",
|
||||
"row": 6
|
||||
},
|
||||
{
|
||||
"size_y": 5,
|
||||
"size_x": 6,
|
||||
"col": 4,
|
||||
"slice_id": "26",
|
||||
"row": 1
|
||||
},
|
||||
{
|
||||
"size_y": 4,
|
||||
"size_x": 6,
|
||||
"col": 7,
|
||||
"slice_id": "27",
|
||||
"row": 9
|
||||
"size_y": 3,
|
||||
"size_x": 4,
|
||||
"col": 9,
|
||||
"slice_id": "611",
|
||||
"row": 0
|
||||
},
|
||||
{
|
||||
"size_y": 3,
|
||||
"size_x": 3,
|
||||
"col": 10,
|
||||
"slice_id": "28",
|
||||
"row": 6
|
||||
"size_x": 4,
|
||||
"col": 5,
|
||||
"slice_id": "612",
|
||||
"row": 0
|
||||
},
|
||||
{
|
||||
"size_y": 4,
|
||||
"size_x": 6,
|
||||
"size_x": 4,
|
||||
"col": 1,
|
||||
"slice_id": "29",
|
||||
"row": 9
|
||||
},
|
||||
{
|
||||
"size_y": 4,
|
||||
"size_x": 5,
|
||||
"col": 8,
|
||||
"slice_id": "30",
|
||||
"row": 13
|
||||
},
|
||||
{
|
||||
"size_y": 4,
|
||||
"size_x": 7,
|
||||
"col": 1,
|
||||
"slice_id": "31",
|
||||
"row": 13
|
||||
"slice_id": "613",
|
||||
"row": 2
|
||||
}
|
||||
]
|
||||
""")
|
||||
|
|
|
|||
|
|
@ -17,13 +17,8 @@ from caravel import models
|
|||
|
||||
|
||||
def upgrade():
|
||||
with op.batch_alter_table('metrics', schema=None) as batch_op:
|
||||
batch_op.add_column(
|
||||
sa.Column('is_restricted', sa.Boolean(), nullable=True))
|
||||
|
||||
with op.batch_alter_table('sql_metrics', schema=None) as batch_op:
|
||||
batch_op.add_column(
|
||||
sa.Column('is_restricted', sa.Boolean(), nullable=True))
|
||||
op.add_column('metrics', sa.Column('is_restricted', sa.Boolean(), nullable=True))
|
||||
op.add_column('sql_metrics', sa.Column('is_restricted', sa.Boolean(), nullable=True))
|
||||
|
||||
bind = op.get_bind()
|
||||
session = db.Session(bind=bind)
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ import numpy as np
|
|||
from flask import request
|
||||
from flask_babelpkg import lazy_gettext as _
|
||||
from markdown import markdown
|
||||
import json
|
||||
import simplejson as json
|
||||
from six import string_types
|
||||
from werkzeug.datastructures import ImmutableMultiDict, MultiDict
|
||||
from werkzeug.urls import Href
|
||||
|
|
@ -267,7 +267,7 @@ class BaseViz(object):
|
|||
|
||||
def json_dumps(self, obj):
|
||||
"""Used by get_json, can be overridden to use specific switches"""
|
||||
return json.dumps(obj, default=utils.json_int_dttm_ser)
|
||||
return json.dumps(obj, default=utils.json_int_dttm_ser, ignore_nan=True)
|
||||
|
||||
@property
|
||||
def data(self):
|
||||
|
|
|
|||
|
|
@ -18,7 +18,8 @@ all_files = 1
|
|||
upload-dir = docs/_build/html
|
||||
|
||||
[nosetests]
|
||||
verbosity=3
|
||||
verbosity=4
|
||||
detailed-errors=1
|
||||
with-coverage=1
|
||||
nocapture=1
|
||||
cover-package=caravel
|
||||
|
|
|
|||
1
setup.py
1
setup.py
|
|
@ -35,6 +35,7 @@ setup(
|
|||
'pydruid==0.3.0, <0.4.0',
|
||||
'python-dateutil>=2.4.2, <3.0.0',
|
||||
'requests>=2.7.0, <3.0.0',
|
||||
'simplejson==3.8.2',
|
||||
'sqlalchemy>=1.0.12, <2.0.0',
|
||||
'sqlalchemy-utils>=0.31.3, <0.32.0',
|
||||
'sqlparse>=0.1.16, <0.2.0',
|
||||
|
|
|
|||
|
|
@ -72,10 +72,12 @@ class CaravelTestCase(unittest.TestCase):
|
|||
def logout(self):
|
||||
resp = self.client.get('/logout/', follow_redirects=True)
|
||||
|
||||
'''
|
||||
def test_welcome(self):
|
||||
self.login()
|
||||
resp = self.client.get('/caravel/welcome')
|
||||
assert 'Welcome' in resp.data.decode('utf-8')
|
||||
'''
|
||||
|
||||
def setup_public_access_for_dashboard(self, table_name):
|
||||
public_role = appbuilder.sm.find_role('Public')
|
||||
|
|
|
|||
Loading…
Reference in New Issue