summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorSimon Charette <charette.s@gmail.com>2013-01-03 15:13:51 +0100
committerClaude Paroz <claude@2xlibre.net>2013-01-03 15:16:23 +0100
commit3fc43c964ef7ab52261ec3a164d66b19f06f5cea (patch)
tree238b346efe2b5e9af44b93efc90941f92ce1a649 /django
parent9b5f64cc6ed5f1e904093fe4e6ff0f681b8e545f (diff)
Fixed #19545 -- Make sure media/is_multipart work with empty formsets
Diffstat (limited to 'django')
-rw-r--r--django/forms/formsets.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/django/forms/formsets.py b/django/forms/formsets.py
index 219a80edee..ee9a2b5f63 100644
--- a/django/forms/formsets.py
+++ b/django/forms/formsets.py
@@ -333,7 +333,10 @@ class BaseFormSet(object):
Returns True if the formset needs to be multipart, i.e. it
has FileInput. Otherwise, False.
"""
- return self.forms and self.forms[0].is_multipart()
+ if self.forms:
+ return self.forms[0].is_multipart()
+ else:
+ return self.empty_form.is_multipart()
@property
def media(self):
@@ -342,7 +345,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 <tr>s -- excluding the <table></table>."