Merge pull request apache#19 from john-bodley/john-bodley-cherry-pick…

…-4567 [payload] Set status code on error rather than query status
michellethomas · Mar 7, 2018 · fb08fa3 · fb08fa3
2 parents 16ee3df + 8c7f1bc
commit fb08fa3
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/superset/views/core.py b/superset/views/core.py
@@ -1095,7 +1095,10 @@ def generate_json(self, datasource_type, datasource_id, form_data,
             return json_error_response(utils.error_msg_from_exception(e))
 
         status = 200
-        if payload.get('status') == QueryStatus.FAILED:
+        if (
+            payload.get('status') == QueryStatus.FAILED or
+            payload.get('error') is not None
+        ):
             status = 400
 
         return json_success(viz_obj.json_dumps(payload), status=status)