Ticket #15203: admin-search.diff

django/contrib/admin/views/main.py

@@ -241 +241 @@
                 return "%s__icontains" % field_name
 
         if self.search_fields and self.query:
-            for bit in self.query.split():
-                or_queries = [models.Q(**{construct_search(str(field_name)): bit}) for field_name in self.search_fields]
-                qs = qs.filter(reduce(operator.or_, or_queries))
+            search_queries = [models.Q(**{construct_search(field_name): self.query})
+                              for field_name in map(str, self.search_fields)
+                              if field_name.startswith('=')]
+            if len(self.search_fields) > 1 or not search_queries:
+                and_queries = []
+                for bit in self.query.split():
+                    or_queries = [models.Q(**{construct_search(field_name): bit})
+                                  for field_name in map(str, self.search_fields)]
+                    and_queries.append(reduce(operator.or_, or_queries))
+                if and_queries:
+                    search_queries.append(reduce(operator.and_, and_queries))
+            if search_queries:
+                qs = qs.filter(reduce(operator.or_, search_queries))
             for field_name in self.search_fields:
                 if '__' in field_name:
                     qs = qs.distinct()