Changeset 6273

Timestamp:

09/15/07 05:12:05 (10 months ago)

Author:

mtredinnick

Message:

Fixed #5387 -- Added is_multipart method to forms. Original patch from Petr Marhhoun. Tests and documentation from Murkt.

Files:

• django/trunk/AUTHORS (modified) (1 diff)
• django/trunk/django/newforms/forms.py (modified) (1 diff)
• django/trunk/django/newforms/widgets.py (modified) (2 diffs)
• django/trunk/docs/newforms.txt (modified) (1 diff)
• django/trunk/tests/regressiontests/forms/tests.py (modified) (1 diff)

django/trunk/AUTHORS

@@ -196 +196 @@
-    masonsimon+django@gmail.com
-    Manuzhai
+    Petr Marhoun <petr.marhoun@gmail.com>
-    Petar Marić <http://www.petarmaric.com/>
-    Nuno Mariz <nmariz@gmail.com>

django/trunk/django/newforms/forms.py

@@ -213 +213 @@
-        return self.cleaned_data
-
+    def is_multipart(self):
+        """
+        Returns True if the form needs to be multipart-encrypted, i.e. it has
+        FileInput. Otherwise, False.
+        """
+        for field in self.fields.values():
+            if field.widget.needs_multipart_form:
+                return True
+        return False
+
-class Form(BaseForm):
-    "A collection of Fields, plus their associated data."

django/trunk/django/newforms/widgets.py

@@ -25 +25 @@
-class Widget(object):
-    is_hidden = False          # Determines whether this corresponds to an <input type="hidden">.
+    needs_multipart_form = False # Determines does this widget need multipart-encrypted form
-
-    def __init__(self, attrs=None):
@@ -121 +122 @@
-class FileInput(Input):
-    input_type = 'file'
+    needs_multipart_form = True
-
-    def render(self, name, value, attrs=None):

django/trunk/docs/newforms.txt

@@ -776 +776 @@
-    # Unbound form with a image field
-    >>> f = ContactFormWithMugshot()
+
+Testing for multipart forms
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If you're writing some reusable views or templates, you may not know ahead of
+time whether your form is a multipart form or not. The ``is_multipart()``
+method tells you if the form requires multipart encoding for submission::
+
+    >>> f = ContactFormWithMugshot()
+    >>> f.is_multipart()
+    True
+
+In a template, this sort of code could be useful::
+
+    {% if form.is_multipart %}
+      <form enctype="multipart/form-data" method="post" action="/foo/">
+    {% else %}
+      <form method="post" action="/foo/">
+    {% endif %}
+    {% form %}
+    </form>
-
-Subclassing forms

django/trunk/tests/regressiontests/forms/tests.py

@@ -3857 +3857 @@
-<p>Comment: <input type="text" name="comment" /></p>
-
+#################################
+# Test multipart-encoded form #
+#################################
+
+>>> class FormWithoutFile(Form):
+...     username = CharField()
+>>> class FormWithFile(Form):
+...     username = CharField()
+...     file = FileField()
+>>> class FormWithImage(Form):
+...     image = ImageField()
+
+>>> FormWithoutFile().is_multipart()
+False
+>>> FormWithFile().is_multipart()
+True
+>>> FormWithImage().is_multipart()
+True
+
-"""
-