From 0d7ea17c14dacf1c87072e1d082a66f37b1badf9 Mon Sep 17 00:00:00 2001 From: Simon Charette Date: Tue, 1 Jan 2013 05:33:52 -0500 Subject: [PATCH] Fixed #19545 -- Make sure formsets with no extra forms provide the correct medias --- django/forms/formsets.py | 2 +- tests/regressiontests/forms/tests/formsets.py | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/django/forms/formsets.py b/django/forms/formsets.py index 3893cc5..a84d3bc 100644 --- a/django/forms/formsets.py +++ b/django/forms/formsets.py @@ -344,7 +344,7 @@ class BaseFormSet(object): if self.forms: return self.forms[0].media else: - return Media() + return self.empty_form.media def as_table(self): "Returns this formset rendered as HTML s -- excluding the
." diff --git a/tests/regressiontests/forms/tests/formsets.py b/tests/regressiontests/forms/tests/formsets.py index bf893c4..0bee972 100644 --- a/tests/regressiontests/forms/tests/formsets.py +++ b/tests/regressiontests/forms/tests/formsets.py @@ -974,11 +974,18 @@ class TestIsBoundBehavior(TestCase): self.assertHTMLEqual(empty_forms[0].as_p(), empty_forms[1].as_p()) class TestEmptyFormSet(TestCase): - "Test that an empty formset still calls clean()" def test_empty_formset_is_valid(self): + """Test that an empty formset still calls clean()""" EmptyFsetWontValidateFormset = formset_factory(FavoriteDrinkForm, extra=0, formset=EmptyFsetWontValidate) formset = EmptyFsetWontValidateFormset(data={'form-INITIAL_FORMS':'0', 'form-TOTAL_FORMS':'0'},prefix="form") formset2 = EmptyFsetWontValidateFormset(data={'form-INITIAL_FORMS':'0', 'form-TOTAL_FORMS':'1', 'form-0-name':'bah' },prefix="form") self.assertFalse(formset.is_valid()) self.assertFalse(formset2.is_valid()) + def test_empty_formset_media(self): + """Make sure media is available on empty formset, refs #19545""" + class MediaForm(Form): + class Media: + js = ('some-file.js',) + self.assertIn('some-file.js', str(formset_factory(MediaForm, extra=0)().media)) + -- 1.7.9.5