[incubator-superset] branch master updated: make sure there is a val to be set for existing filters (#5257)

[ma...@apache.org]

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

maximebeauchemin 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 d4672db  make sure there is a val to be set for existing filters (#5257)
d4672db is described below

commit d4672dbfb7e6f39a59eedb7236b1f5676e6fe531
Author: Hugh A. Miles II <hu...@gmail.com>
AuthorDate: Thu Jun 21 22:00:50 2018 -0700

    make sure there is a val to be set for existing filters (#5257)
---
 superset/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset/utils.py b/superset/utils.py
index 61d5cb6..ed9968c 100644
--- a/superset/utils.py
+++ b/superset/utils.py
@@ -737,7 +737,7 @@ def merge_extra_filters(form_data):
             return f['col'] + '__' + f['op']
         existing_filters = {}
         for existing in form_data['filters']:
-            if existing['col'] is not None:
+            if existing['col'] is not None and existing['val'] is not None:
                 existing_filters[get_filter_key(existing)] = existing['val']
         for filtr in form_data['extra_filters']:
             # Pull out time filters/options and merge into form data