summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Bennett <ubernostrum@gmail.com>2008-11-20 19:02:17 +0000
committerJames Bennett <ubernostrum@gmail.com>2008-11-20 19:02:17 +0000
commit0f5258684eb11f144795d5e9f49b80b6ffc09e01 (patch)
treed349f6852bebe678e94076a70430ef8558289dd2
parent5cc5451a3f198022857de1f19c736319ee6b72f7 (diff)
[1.0.X] OneToOne? filtering should only apply in a popup selection from the related model. This was [9507] in trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9508 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/contrib/admin/views/main.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py
index b450e89459..1051648361 100644
--- a/django/contrib/admin/views/main.py
+++ b/django/contrib/admin/views/main.py
@@ -237,7 +237,7 @@ class ChangeList(object):
qs = qs.distinct()
break
- if self.opts.one_to_one_field:
+ if self.is_popup and self.opts.one_to_one_field:
qs = qs.complex_filter(self.opts.one_to_one_field.rel.limit_choices_to)
return qs