From 3fa217ec05578113b3fecb0743488e0e1efe005b Mon Sep 17 00:00:00 2001 From: Grace Guo Date: Wed, 7 Mar 2018 10:57:33 -0800 Subject: [PATCH] [bug] fix shortener url (#4560) [bug] fix shared explore url (cherry picked from commit 369f652bfc4aef377de33eda2c5559e6f0c5c442) --- superset/views/core.py | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/superset/views/core.py b/superset/views/core.py index 2e00720a2aa0b..ebdcad59da8b1 100755 --- a/superset/views/core.py +++ b/superset/views/core.py @@ -970,6 +970,17 @@ def get_form_data(self, slice_id=None): if request_args_data: form_data.update(json.loads(request_args_data)) + url_id = request.args.get('r') + if url_id: + saved_url = db.session.query(models.Url).filter_by(id=url_id).first() + if saved_url: + url_str = parse.unquote_plus( + saved_url.url.split('?')[1][10:], encoding='utf-8', errors=None) + url_form_data = json.loads(url_str) + # allow form_date in request override saved url + url_form_data.update(form_data) + form_data = url_form_data + if request.args.get('viz_type'): # Converting old URLs form_data = cast_form_data(form_data) @@ -1217,18 +1228,6 @@ def explore(self, datasource_type=None, datasource_id=None): datasource_id, datasource_type = self.datasource_info( datasource_id, datasource_type, form_data) - saved_url = None - url_id = request.args.get('r') - if url_id: - saved_url = db.session.query(models.Url).filter_by(id=url_id).first() - if saved_url: - url_str = parse.unquote_plus( - saved_url.url.split('?')[1][10:], encoding='utf-8', errors=None) - url_form_data = json.loads(url_str) - # allow form_date in request override saved url - url_form_data.update(form_data) - form_data = url_form_data - error_redirect = '/slicemodelview/list/' datasource = ConnectorRegistry.get_datasource( datasource_type, datasource_id, db.session)