Luke Plant  committed 55655c2

[1.2.X] Fixed #11707 - limit_choices_to on a ForeignKey can render duplicate options in formfield

Thanks to Chris Wesseling for the report and patch.

Backport of [15607] from trunk.

  • Participants
  • Parent commits 15135ae
  • Branches releases/1.2.X

Comments (0)

Files changed (3)

File django/db/models/fields/

         db = kwargs.pop('using', None)
         defaults = {
             'form_class': forms.ModelChoiceField,
-            'queryset':,
+            'queryset':,
             'to_field_name': self.rel.field_name,

File tests/regressiontests/model_fields/

     b = models.CharField(max_length=10)
     a = models.ForeignKey(Foo, default=get_foo)
+class Baz(models.Model):
+    a = models.CharField(max_length=5)
+    #Only Foos related to Bars starting with 'a'
+    foo = models.ForeignKey(Foo, limit_choices_to=models.Q(bar__b__startswith='a'))
 class Whiz(models.Model):
     CHOICES = (
         ('Group 1', (

File tests/regressiontests/model_fields/

 import datetime
 import unittest
 from decimal import Decimal
+import re
 import django.test
 from django import forms
 from django.db import models
 from django.core.exceptions import ValidationError
-from models import Foo, Bar, Whiz, BigD, BigS, Image, BigInt, Post, NullBooleanModel, BooleanModel
+from models import Foo, Bar, Baz, Whiz, BigD, BigS, Image, BigInt, Post, NullBooleanModel, BooleanModel
 # If PIL available, do these tests.
 if Image:
         # This should not crash. That counts as a win for our purposes.
+class BazForm(forms.ModelForm):
+    class Meta:
+        model = Baz
 class ForeignKeyTests(django.test.TestCase):
     def test_callable_default(self):
         """Test the use of a lazy callable for ForeignKey.default"""
         b = Bar.objects.create(b="bcd")
         self.assertEqual(b.a, a)
+    def test_distinct_choice_limit(self):
+        """Doesn't make sense to offer the same ForeignKey multiple times in a form"""
+        a = Foo.objects.create(a='a', d=Decimal("-1"))
+        b = Foo.objects.create(a='b', d=Decimal("1"))
+        bar_a = Bar.objects.create(b='ah', a=a)
+        bar_b = Bar.objects.create(b='aha', a=a)
+        bar_b = Bar.objects.create(b='bla', a=b)
+        form = BazForm()
+        fk_field = str(form['foo'])
+        self.assertEqual(len(re.findall(r'value="2"', fk_field)), 0)
+        self.assertEqual(len(re.findall(r'value="1"', fk_field)), 1)
 class DateTimeFieldTests(unittest.TestCase):
     def test_datetimefield_to_python_usecs(self):
         """DateTimeField.to_python should support usecs"""