mirror of
https://github.com/apache/superset.git
synced 2024-09-17 19:19:38 -04:00
wrapping all request params into url_params
This commit is contained in:
parent
0f350adaf4
commit
17197c1a5b
@ -43,7 +43,8 @@ def url_param(param, default=None):
|
|||||||
# Supporting POST as well as get
|
# Supporting POST as well as get
|
||||||
if request.form.get('form_data'):
|
if request.form.get('form_data'):
|
||||||
form_data = json.loads(request.form.get('form_data'))
|
form_data = json.loads(request.form.get('form_data'))
|
||||||
return form_data.get(param, default)
|
url_params = form_data['url_params'] or {}
|
||||||
|
return url_params.get(param, default)
|
||||||
return default
|
return default
|
||||||
|
|
||||||
|
|
||||||
|
@ -836,10 +836,12 @@ def merge_extra_filters(form_data):
|
|||||||
|
|
||||||
|
|
||||||
def merge_request_params(form_data, params):
|
def merge_request_params(form_data, params):
|
||||||
|
url_params = {}
|
||||||
for key, value in params.items():
|
for key, value in params.items():
|
||||||
if key == 'form_data':
|
if key in ('form_data', 'r'):
|
||||||
continue
|
continue
|
||||||
form_data[key] = value
|
url_params[key] = value
|
||||||
|
form_data['url_params'] = url_params
|
||||||
|
|
||||||
|
|
||||||
def get_update_perms_flag():
|
def get_update_perms_flag():
|
||||||
|
@ -227,7 +227,8 @@ class UtilsTestCase(unittest.TestCase):
|
|||||||
'dashboard_ids': '(1,2,3,4,5)',
|
'dashboard_ids': '(1,2,3,4,5)',
|
||||||
}
|
}
|
||||||
merge_request_params(form_data, url_params)
|
merge_request_params(form_data, url_params)
|
||||||
self.assertIn('dashboard_ids', form_data.keys())
|
self.assertIn('url_params', form_data.keys())
|
||||||
|
self.assertIn('dashboard_ids', form_data['url_params'])
|
||||||
self.assertNotIn('form_data', form_data.keys())
|
self.assertNotIn('form_data', form_data.keys())
|
||||||
|
|
||||||
def test_datetime_f(self):
|
def test_datetime_f(self):
|
||||||
|
Loading…
Reference in New Issue
Block a user