Ticket #13145: custom-empty-form-prefix.3.diff

django/contrib/admin/media/js/inlines.js

@@ -56 +56 @@
                                 var template = $("#" + options.prefix + "-empty");
                                 var row = template.clone(true).get(0);
                                 $(row).removeClass(options.emptyCssClass).removeAttr("id").insertBefore($(template));
-                                $(row).html($(row).html().replace(/__prefix__/g, nextIndex));
+                                $(row).html($(row).html().replace(new RegExp(options.empty_form_prefix, "g"), nextIndex));
                                 $(row).addClass(options.formCssClass).attr("id", options.prefix + nextIndex);
                                 if ($(row).is("TR")) {
                                         // If the forms are laid out in table rows, insert
@@ -118 +118 @@
         /* Setup plugin defaults */
         $.fn.formset.defaults = {
                 prefix: "form",                                 // The form prefix for your django formset
+                empty_form_prefix: "__prefix__",// The magic prefix bit on the empty form.
                 addText: "add another",                 // Text for the add link
                 deleteText: "remove",                   // Text for the delete link
                 addCssClass: "add-row",                 // CSS class applied to the add link

django/contrib/admin/templates/admin/edit_inline/stacked.html

@@ -50 +50 @@
         }
         $(rows).formset({
             prefix: "{{ inline_admin_formset.formset.prefix }}",
+            empty_form_prefix: "{{ inline_admin_formset.formset.empty_form_prefix }}",
             addText: "{% blocktrans with inline_admin_formset.opts.verbose_name|title as verbose_name %}Add another {{ verbose_name }}{% endblocktrans %}",
             formCssClass: "dynamic-{{ inline_admin_formset.formset.prefix }}",
             deleteCssClass: "inline-deletelink",

django/contrib/admin/templates/admin/edit_inline/tabular.html

@@ -96 +96 @@
         }
         $(rows).formset({
             prefix: "{{ inline_admin_formset.formset.prefix }}",
+            empty_form_prefix: "{{ inline_admin_formset.formset.empty_form_prefix }}",
             addText: "{% blocktrans with inline_admin_formset.opts.verbose_name|title as verbose_name %}Add another {{ verbose_name }}{% endblocktrans %}",
             formCssClass: "dynamic-{{ inline_admin_formset.formset.prefix }}",
             deleteCssClass: "inline-deletelink",

django/forms/formsets.py

@@ -32 +32 @@
     """
     A collection of instances of the same Form class.
     """
+    empty_form_prefix = '__prefix__'
+
     def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None,
                  initial=None, error_class=ErrorList):
         self.is_bound = data is not None or files is not None
@@ -125 +127 @@
     def _get_empty_form(self, **kwargs):
         defaults = {
             'auto_id': self.auto_id,
-            'prefix': self.add_prefix('__prefix__'),
+            'prefix': self.add_prefix(self.empty_form_prefix),
             'empty_permitted': True,
         }
         if self.data or self.files:

tests/regressiontests/forms/formsets.py

@@ -1 +1 @@
 # -*- coding: utf-8 -*-
+
+from django import forms
+from django.forms.formsets import formset_factory
+from django.forms.models import inlineformset_factory
+from django.test import TestCase
+
+from models import Form, FormPage, Field
+
+
+class EmptyFormTestCase(TestCase):
+    def test_custom_empty_form_prefix(self):
+        class BasicForm(forms.Form):
+            value = forms.CharField()
+        
+        FormSet = formset_factory(BasicForm)
+        FormSet.empty_form_prefix = "__pony__"
+        self.assertEqual(str(FormSet().empty_form), """<tr><th><label for="id_form-__pony__-value">Value:</label></th><td><input type="text" name="form-__pony__-value" id="id_form-__pony__-value" /></td></tr>""")
+    
+    def test_custom_empty_form_prefix_nested_formsets(self):
+        class PageForm(forms.ModelForm):
+            def __init__(self, *args, **kwargs):
+                super(PageForm, self).__init__(*args, **kwargs)
+                self.field_formset = FieldFormSet(self.is_bound and self.data or None,
+                    instance=self.instance, prefix=self.prefix)
+                self.field_formset.empty_form_prefix = "__field_prefix__"
+                
+        FormPageFormSet = inlineformset_factory(Form, FormPage, form=PageForm)
+        FieldFormSet = inlineformset_factory(FormPage, Field)
+        
+        f = FormPageFormSet(instance=Form())
+        self.assertFalse("__prefix__-__prefix__" in str(f.empty_form.field_formset.empty_form))
+
+
 tests = """
 # Basic FormSet creation and usage ############################################
 

tests/regressiontests/forms/models.py

@@ -56 +56 @@
     def __unicode__(self):
         return u'%s' % self.name
 
+class Form(models.Model):
+    name = models.CharField(max_length=100)
+
+
+class FormPage(models.Model):
+    form = models.ForeignKey(Form)
+    page_num = models.IntegerField()
+
+
+class Field(models.Model):
+    page = models.ForeignKey(FormPage)
+    label = models.CharField(max_length=100)
+
+
 class TestTicket12510(TestCase):
     ''' It is not necessary to generate choices for ModelChoiceField (regression test for #12510). '''
     def setUp(self):

tests/regressiontests/forms/tests.py

@@ -34 +34 @@
 from regressions import tests as regression_tests
 from util import tests as util_tests
 from widgets import tests as widgets_tests
-from formsets import tests as formset_tests
+from formsets import tests as formset_tests, EmptyFormTestCase
 from media import media_tests
 
 from fields import FieldsTests