From fd913402bcda0bee1a6f448c7cfda841422f1d47 Mon Sep 17 00:00:00 2001 From: Arik Fraimovich Date: Sun, 3 Apr 2016 10:42:48 +0300 Subject: [PATCH] Fix: on first save, make sure we load alredy existing data --- rd_ui/app/scripts/controllers/query_source.js | 2 +- redash/handlers/queries.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/rd_ui/app/scripts/controllers/query_source.js b/rd_ui/app/scripts/controllers/query_source.js index b6690386c..ec3086cbe 100644 --- a/rd_ui/app/scripts/controllers/query_source.js +++ b/rd_ui/app/scripts/controllers/query_source.js @@ -59,7 +59,7 @@ if (isNewQuery) { // redirect to new created query (keep hash) - $location.path(savedQuery.getSourceLink()).replace(); + $location.path(savedQuery.getSourceLink()); } }); diff --git a/redash/handlers/queries.py b/redash/handlers/queries.py index 3b3791af3..3057a3f1c 100644 --- a/redash/handlers/queries.py +++ b/redash/handlers/queries.py @@ -54,6 +54,10 @@ class QueryListResource(BaseResource): for field in ['id', 'created_at', 'api_key', 'visualizations', 'latest_query_data', 'last_modified_by']: query_def.pop(field, None) + # If we already executed this query, save the query result reference + if 'latest_query_data_id' in query_def: + query_def['latest_query_data'] = query_def.pop('latest_query_data_id') + query_def['user'] = self.current_user query_def['data_source'] = data_source query_def['org'] = self.current_org