Commit bbe034a7 authored by Brian Rosner's avatar Brian Rosner
Browse files

[1.0.X] Fixed #11302 -- Avoid unnesscary (and possibly unintentional)... 

[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
parent ea5e5a20

django/contrib/contenttypes/generic.py

+1 −1
Original line number Diff line number Diff line
@@ -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),