Ticket #6933: django-6933-1.diff

django/contrib/admin/views/main.py

@@ -11 +11 @@
 from django.db.models.query import QuerySet
 from django.http import Http404, HttpResponse, HttpResponseRedirect
 from django.utils.html import escape
-from django.utils.text import capfirst, get_text_list
+from django.utils.text import capfirst, get_text_list, smart_split
 from django.utils.encoding import force_unicode, smart_str
 from django.utils.translation import ugettext as _
 from django.utils.safestring import mark_safe
@@ -732 +732 @@
                 return "%s__icontains" % field_name
 
         if self.lookup_opts.admin.search_fields and self.query:
-            for bit in self.query.split():
+            for bit in smart_split(self.query):
+                bit = bit.strip("\'\"")
                 or_queries = [models.Q(**{construct_search(field_name): bit}) for field_name in self.lookup_opts.admin.search_fields]
                 other_qs = QuerySet(self.model)
                 other_qs.dup_select_related(qs)

docs/model-api.txt

@@ -1626 +1626 @@
     WHERE (first_name ILIKE '%john%' OR last_name ILIKE '%john%')
     AND (first_name ILIKE '%lennon%' OR last_name ILIKE '%lennon%')
 
+.. admonition:: Note
+
+    To search for phrase with a space use quotes. Supports double and
+    single quotes, and supports escaping quotes with backslashes.
+    ``"Foo bar" boo`` searches for ``foo bar`` and ``boo`` while
+    ``foo bar boo`` searches for ``foo`` and ``bar`` and ``foo``.
+    
 For faster and/or more restrictive searches, prefix the field name
 with an operator: