QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-07-11 17:25:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge conflicts

Browse Source
This commit is contained in:
Hugh Miles
2017-11-02 18:06:29 -07:00
committed by Maxime Beauchemin
parent 445f1e204c
commit 1060484836
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
superset/views/core.py
View File

@@ -998,8 +998,8 @@ class Superset(BaseSupersetView):
mimetype='application/json')
@log_this
@has_access_api
@expose('/explore_json/<datasource_type>/<datasource_id>/')
# @has_access_api # remove until we figure out auth REMOTE_USER
@expose("/explore_json/<datasource_type>/<datasource_id>/")
def explore_json(self, datasource_type, datasource_id):
try:
viz_obj = self.get_viz(
@@ -1012,7 +1012,7 @@ class Superset(BaseSupersetView):
utils.error_msg_from_exception(e),
stacktrace=traceback.format_exc())
if not self.datasource_access(viz_obj.datasource):
if not self.datasource_access(viz_obj.datasource) and request.args.get("restful") != "true":
return json_error_response(DATASOURCE_ACCESS_ERR, status=404)
if request.args.get('csv') == 'true':