辞書内包表記でkeyが同一となり上書きされていたのを修正

okwrtdsh · Dec 7, 2016 · 5295086 · 5295086
1 parent e0282b3
commit 5295086
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/django_cbv_utils/forms/search.py b/django_cbv_utils/forms/search.py
@@ -121,8 +121,10 @@ def _get_queries(self, queryset_filter):
                     continue
                 q = Q()
                 for target in target_list:
-                    for v in re.split("\s", data):
-                        q |= Q(**{'{0}__icontains'.format(target): v})
+                    _q = Q()
+                    for v in re.split('\s', data):
+                        _q |= Q(**{'{0}__icontains'.format(target): v})
+                    q |= _q
                 queries &= q
                 continue
 
@@ -131,8 +133,10 @@ def _get_queries(self, queryset_filter):
                     continue
                 q = Q()
                 for target in target_list:
-                    q |= Q(**{'{0}__icontains'.format(target): v
-                              for v in re.split("\s", data)})
+                    _q = Q()
+                    for v in re.split('\s', data):
+                        _q &= Q(**{'{0}__icontains'.format(target): v})
+                    q |= _q
                 queries &= q
                 continue