Skip to content

Fix more places where feature flags are serialized #8567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
betodealmeida merged 1 commit into from
Nov 14, 2019
Merged

Fix more places where feature flags are serialized #8567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions superset/views/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1276,7 +1276,9 @@ def explore(self, datasource_type=None, datasource_id=None):
title = _("Explore - %(table)s", table=table_name)
return self.render_template(
"superset/basic.html",
bootstrap_data=json.dumps(bootstrap_data),
bootstrap_data=json.dumps(
bootstrap_data, default=utils.pessimistic_json_iso_dttm_ser
),
entry="explore",
title=title,
standalone_mode=standalone,
Expand Down Expand Up @@ -2186,14 +2188,18 @@ def dashboard(**kwargs):
}

if request.args.get("json") == "true":
return json_success(json.dumps(bootstrap_data))
return json_success(
json.dumps(bootstrap_data, default=utils.pessimistic_json_iso_dttm_ser)
)

return self.render_template(
"superset/dashboard.html",
entry="dashboard",
standalone_mode=standalone_mode,
title=dash.dashboard_title,
bootstrap_data=json.dumps(bootstrap_data),
bootstrap_data=json.dumps(
bootstrap_data, default=utils.pessimistic_json_iso_dttm_ser
),
)

@api
Expand Down Expand Up @@ -2990,7 +2996,9 @@ def profile(self, username):
"superset/basic.html",
title=_("%(user)s's profile", user=username),
entry="profile",
bootstrap_data=json.dumps(payload, default=utils.json_iso_dttm_ser),
bootstrap_data=json.dumps(
payload, default=utils.pessimistic_json_iso_dttm_ser
),
)

@has_access
Expand Down
15 changes: 10 additions & 5 deletions tests/core_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -963,11 +963,16 @@ def test_feature_flag_serialization(self):
)
html = cgi.escape(encoded).replace("'", "'").replace('"', """)

data = self.get_resp("/superset/sqllab")
self.assertTrue(html in data)

data = self.get_resp("/superset/welcome")
self.assertTrue(html in data)
urls = [
"/superset/sqllab",
"/superset/welcome",
"/superset/dashboard/1/",
"/superset/profile/admin/",
"/superset/explore/table/1",
]
for url in urls:
data = self.get_resp(url)
self.assertTrue(html in data)


if __name__ == "__main__":
Expand Down