Permalink
Browse files

[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
  • Loading branch information...
1 parent ea5e5a2 commit bbe034a74f33296f228a9d19fb3dc07072a079e7 @brosner brosner committed Jun 11, 2009
Showing with 1 addition and 1 deletion.
  1. +1 −1 django/contrib/contenttypes/generic.py
View
2 django/contrib/contenttypes/generic.py
@@ -317,7 +317,7 @@ def get_default_prefix(cls):
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),

0 comments on commit bbe034a

Please sign in to comment.