Ticket #9076: inline_queryset.diff

django/forms/models.py

@@ -447 +447 @@
 class BaseInlineFormSet(BaseModelFormSet):
     """A formset for child objects related to a parent."""
     def __init__(self, data=None, files=None, instance=None,
-                 save_as_new=False, prefix=None):
+                 save_as_new=False, prefix=None, queryset=None):
         from django.db.models.fields.related import RelatedObject
         self.instance = instance
         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()
-        super(BaseInlineFormSet, self).__init__(data, files, prefix=prefix or self.rel_name)
+        if queryset is None:
+            kwargs = {self.fk.name: self.instance}
+            queryset = self.model._default_manager.filter(**kwargs)
+        super(BaseInlineFormSet, self).__init__(data, files, prefix=prefix or self.rel_name,
+            queryset=queryset)
 
     def _construct_forms(self):
         if self.save_as_new:
@@ -469 +473 @@
             form.data[form.add_prefix(self._pk_field.name)] = None
         return form
 
-    def get_queryset(self):
-        """
-        Returns this FormSet's queryset, but restricted to children of
-        self.instance
-        """
-        kwargs = {self.fk.name: self.instance}
-        return self.model._default_manager.filter(**kwargs)
-
     def save_new(self, form, commit=True):
         kwargs = {self.fk.get_attname(): self.instance.pk}
         new_obj = self.model(**kwargs)