diff --git a/django/contrib/contenttypes/generic.py b/django/contrib/contenttypes/generic.py index c294f74..d4023f3 100644 --- a/django/contrib/contenttypes/generic.py +++ b/django/contrib/contenttypes/generic.py @@ -291,7 +291,8 @@ class BaseGenericInlineFormSet(BaseModelFormSet): ct_field_name = "content_type" ct_fk_field_name = "object_id" - def __init__(self, data=None, files=None, instance=None, save_as_new=None): + def __init__(self, data=None, files=None, instance=None, + save_as_new=None, prefix=None): opts = self.model._meta self.instance = instance self.rel_name = '-'.join(( @@ -300,7 +301,7 @@ class BaseGenericInlineFormSet(BaseModelFormSet): )) super(BaseGenericInlineFormSet, self).__init__( queryset=self.get_queryset(), data=data, files=files, - prefix=self.rel_name + prefix=prefix or self.rel_name ) def get_queryset(self): diff --git a/tests/modeltests/generic_relations/models.py b/tests/modeltests/generic_relations/models.py index db5ae47..2c8bbfa 100644 --- a/tests/modeltests/generic_relations/models.py +++ b/tests/modeltests/generic_relations/models.py @@ -233,4 +233,10 @@ __test__ = {'API_TESTS':"""
+>>> formset = GenericFormSet(instance=lion, prefix='x') +>>> for form in formset.forms: +... print form.as_p() +
+
+ """}