summaryrefslogtreecommitdiff
path: root/django/forms/models.py
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2012-12-28 23:16:13 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2012-12-28 23:35:08 +0100
commit5097d3c5faab2b6582c4cebee2b265fcdbb893eb (patch)
tree7ca9e4458d785ab0e30b0afcd07bea5ed39106c5 /django/forms/models.py
parentbe4259004fd21ff5c78f02e9093a0786780e1c21 (diff)
[1.5.x] Fix #19524 -- Incorrect caching of parents of unsaved model instances.
Thanks qcwxezdas for the report. Refs #13839. Backport of e9c24be.
Diffstat (limited to 'django/forms/models.py')
-rw-r--r--django/forms/models.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/django/forms/models.py b/django/forms/models.py
index 0913a4e8b8..27c246b668 100644
--- a/django/forms/models.py
+++ b/django/forms/models.py
@@ -692,7 +692,10 @@ class BaseInlineFormSet(BaseModelFormSet):
self.rel_name = RelatedObject(self.fk.rel.to, self.model, self.fk).get_accessor_name()
if queryset is None:
queryset = self.model._default_manager
- qs = queryset.filter(**{self.fk.name: self.instance})
+ if self.instance.pk:
+ qs = queryset.filter(**{self.fk.name: self.instance})
+ else:
+ qs = queryset.none()
super(BaseInlineFormSet, self).__init__(data, files, prefix=prefix,
queryset=qs, **kwargs)