From 227c5e80dbff2b731a1cba8c4dd94c00526a3e76 Mon Sep 17 00:00:00 2001 From: Carl Meyer Date: Tue, 25 Jan 2011 03:14:28 +0000 Subject: Fixed #11319 - Added lookup support for ForeignKey.to_field. Also reverted no-longer-needed model formsets workaround for lack of such support from r10756. Thanks Russell and Alex for review. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15303 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/forms/models.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'django/forms') diff --git a/django/forms/models.py b/django/forms/models.py index de52b6a7e0..6babebbe36 100644 --- a/django/forms/models.py +++ b/django/forms/models.py @@ -700,13 +700,9 @@ class BaseInlineFormSet(BaseModelFormSet): self.save_as_new = save_as_new # is there a better way to get the object descriptor? self.rel_name = RelatedObject(self.fk.rel.to, self.model, self.fk).get_accessor_name() - if self.fk.rel.field_name == self.fk.rel.to._meta.pk.name: - backlink_value = self.instance - else: - backlink_value = getattr(self.instance, self.fk.rel.field_name) if queryset is None: queryset = self.model._default_manager - qs = queryset.filter(**{self.fk.name: backlink_value}) + qs = queryset.filter(**{self.fk.name: self.instance}) super(BaseInlineFormSet, self).__init__(data, files, prefix=prefix, queryset=qs) -- cgit v1.3