diff options
| author | Brian Rosner <brosner@gmail.com> | 2009-06-11 19:06:12 +0000 |
|---|---|---|
| committer | Brian Rosner <brosner@gmail.com> | 2009-06-11 19:06:12 +0000 |
| commit | bbe034a74f33296f228a9d19fb3dc07072a079e7 (patch) | |
| tree | c2f66946f7b690f5dd431e136be0ba8778ee2a0a | |
| parent | ea5e5a20a9e73d412a87b05d3fc90f447ff0b0db (diff) | |
[1.0.X] Fixed #11302 -- Avoid unnesscary (and possibly unintentional) queries/results from generic inline formsets.
When an instance with no primary key value is passed in to a generic inline
formset we ensure no queries/results occur. Thanks Alex Gaynor.
Backport of [10981] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10982 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/contrib/contenttypes/generic.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/contenttypes/generic.py b/django/contrib/contenttypes/generic.py index 5564548133..4df48ff9f5 100644 --- a/django/contrib/contenttypes/generic.py +++ b/django/contrib/contenttypes/generic.py @@ -317,7 +317,7 @@ class BaseGenericInlineFormSet(BaseModelFormSet): def get_queryset(self): # Avoid a circular import. from django.contrib.contenttypes.models import ContentType - if self.instance is None: + if self.instance is None or self.instance.pk is None: return self.model._default_manager.none() return self.model._default_manager.filter(**{ self.ct_field.name: ContentType.objects.get_for_model(self.instance), |