Fixed #2269 -- limit_choices_to now works properly with a custom ForeignKey.to_field. Thanks for reporting, mir@noris.de
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3507 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
1a428ec9b8
commit
97e820ab3a
|
@ -289,7 +289,7 @@ class Field(object):
|
|||
if self.choices:
|
||||
return first_choice + list(self.choices)
|
||||
rel_model = self.rel.to
|
||||
return first_choice + [(x._get_pk_val(), str(x))
|
||||
return first_choice + [(getattr(x, self.rel.get_related_field().attname), str(x))
|
||||
for x in rel_model._default_manager.complex_filter(self.rel.limit_choices_to)]
|
||||
|
||||
def get_choices_default(self):
|
||||
|
|
Loading…
Reference in New Issue