Ticket #2559: django-search_fields-operators_pre_magic_removal.diff

django/contrib/admin/views/main.py

@@ -218 +218 @@
                         lookup_params['select_related'] = True
                         break
         lookup_params['order_by'] = ((order_type == 'desc' and '-' or '') + lookup_order_field,)
+
+        # Apply keyword searches.
+        def construct_search(field_name):
+            if field_name.startswith('^'):
+                return "%s__istartswith" % field_name[1:]
+            elif field_name.startswith('='):
+                return "%s__iexact" % field_name[1:]
+            elif field_name.startswith('@'):
+                return "%s__search" % field_name[1:]
+            else:
+                return "%s__icontains" % field_name
+
         if lookup_opts.admin.search_fields and query:
             complex_queries = []
             for bit in query.split():
                 or_queries = []
                 for field_name in lookup_opts.admin.search_fields:
-                    or_queries.append(meta.Q(**{'%s__icontains' % field_name: bit}))
+                    or_queries.append(meta.Q(**{construct_search(field_name): bit}))
                 complex_queries.append(reduce(operator.or_, or_queries))
             lookup_params['complex'] = reduce(operator.and_, complex_queries)
         if opts.one_to_one_field: