[incubator-superset] branch master updated: [ad-hoc filters] Remove legacy split in /explore (#5533)

[jo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

johnbodley pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git


The following commit(s) were added to refs/heads/master by this push:
     new e52518c  [ad-hoc filters] Remove legacy split in /explore (#5533)
e52518c is described below

commit e52518c3cd3eb623f451c0d5ea1d6608654f84fa
Author: John Bodley <45...@users.noreply.github.com>
AuthorDate: Wed Aug 1 09:21:15 2018 -0700

    [ad-hoc filters] Remove legacy split in /explore (#5533)
---
 superset/views/core.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/superset/views/core.py b/superset/views/core.py
index a49f37e..0e41d45 100755
--- a/superset/views/core.py
+++ b/superset/views/core.py
@@ -1280,10 +1280,9 @@ class Superset(BaseSupersetView):
 
         form_data['datasource'] = str(datasource_id) + '__' + datasource_type
 
-        # On explore, merge extra filters into the form data
+        # On explore, merge legacy and extra filters into the form data
         utils.convert_legacy_filters_into_adhoc(form_data)
         merge_extra_filters(form_data)
-        utils.split_adhoc_filters_into_base_filters(form_data)
 
         # merge request url params
         if request.method == 'GET':