Context Navigation

Ticket #16063: django_1_2_5_admin_search_m2m_prevent_multiple_joining.diff

File django_1_2_5_admin_search_m2m_prevent_multiple_joining.diff, 943 bytes (added by Evgeny Sizikov, 13 years ago)
patch has been made from Mercurial repository

diff -r 9f23205f00f4 django/contrib/admin/views/main.py

-              a
                 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))
+            qs = qs.filter(*[reduce(operator.or_, [models.Q(**{construct_search(str(field_name)): bit})
+                                                   for field_name in self.search_fields])
+                             for bit in self.query.split()])
             for field_name in self.search_fields:
                 if '__' in field_name:
                     qs = qs.distinct()