Ticket #15517: patch_modeladmin_search_fields.diff

django/contrib/admin/views/main.py

@@ -254 +254 @@
                 return "%s__icontains" % field_name
 
         if self.search_fields and self.query:
+            constructed_fields = [construct_search(str(field_name))
+                                  for field_name in self.search_fields]
             for bit in self.query.split():
-                or_queries = [models.Q(**{construct_search(str(field_name)): bit}) for field_name in self.search_fields]
+                or_queries = [models.Q(**{field_name: bit})
+                              for field_name in constructed_fields]
                 qs = qs.filter(reduce(operator.or_, or_queries))
             if not use_distinct:
-                for search_field in self.search_fields:
+                for search_field in constructed_fields:
                     field_name = search_field.split('__', 1)[0]
                     f = self.lookup_opts.get_field_by_name(field_name)[0]
                     if hasattr(f, 'rel') and isinstance(f.rel, models.ManyToManyRel):