summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2013-08-04 07:30:30 -0400
committerTim Graham <timograham@gmail.com>2013-08-04 07:30:30 -0400
commit90bdb42702327a4ef74e74d2e123da0731a90c4c (patch)
tree18603d600bc95b81f9f2d0b6265e8b97979b5320
parent9053c6da5fcfe98c05527591f9fd785223eb354a (diff)
[1.6.x] Fixed backport error in previous commit; refs #15961
-rw-r--r--django/contrib/admin/options.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
index b2f90ca4d9..8c88506a15 100644
--- a/django/contrib/admin/options.py
+++ b/django/contrib/admin/options.py
@@ -756,10 +756,9 @@ class ModelAdmin(BaseModelAdmin):
return "%s__icontains" % field_name
use_distinct = False
- search_fields = self.get_search_fields(request)
- if search_fields and search_term:
+ if self.search_fields and search_term:
orm_lookups = [construct_search(str(search_field))
- for search_field in search_fields]
+ for search_field in self.search_fields]
for bit in search_term.split():
or_queries = [models.Q(**{orm_lookup: bit})
for orm_lookup in orm_lookups]