From 10604848365dddbd8dc6fa06f104f686be2cbc8a Mon Sep 17 00:00:00 2001
From: Hugh Miles <hmiles@lyft.com>
Date: Thu, 2 Nov 2017 18:06:29 -0700
Subject: [PATCH] Merge conflicts

---
 superset/views/core.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/superset/views/core.py b/superset/views/core.py
index 8307e4f4fd1..cf6b6a35b2f 100755
--- a/superset/views/core.py
+++ b/superset/views/core.py
@@ -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':