Changeset 4298

Timestamp:

01/08/07 23:12:25 (2 years ago)

Author:

adrian

Message:

Fixed #3193 -- newforms: Modified as_hidden() to handle MultipleChoiceField? correctly. Thanks for the report, Honza Kral

Files:

• django/trunk/django/newforms/fields.py (modified) (3 diffs)
• django/trunk/django/newforms/forms.py (modified) (2 diffs)
• django/trunk/django/newforms/widgets.py (modified) (2 diffs)
• django/trunk/tests/regressiontests/forms/tests.py (modified) (2 diffs)

django/trunk/django/newforms/fields.py

@@ -5 +5 @@
-from django.utils.translation import gettext
-from util import ValidationError, smart_unicode
-
+HiddenInput, MultipleHiddenInput, 
-import datetime
-import re
@@ -30 +30 @@
-class Field(object):
-    widget = TextInput # Default widget to use when rendering this type of Field.
+    hidden_widget = HiddenInput # Default widget to use when rendering this as "hidden".
-
-    # Tracks each time a Field instance is created. Used to retain order.
@@ -337 +338 @@
-
-class MultipleChoiceField(ChoiceField):
+    hidden_widget = MultipleHiddenInput
+
-    def __init__(self, choices=(), required=True, widget=SelectMultiple, label=None, initial=None):
-        ChoiceField.__init__(self, choices, required, widget, label, initial)

django/trunk/django/newforms/forms.py

@@ -6 +6 @@
-from django.utils.html import escape
-from fields import Field
-
+, MultipleHiddenInput
-from util import StrAndUnicode, ErrorDict, ErrorList, ValidationError
-
@@ -239 +239 @@
-        Returns a string of HTML for representing this as an <input type="hidden">.
-        """
-HiddenInpu
+self.field.hidden_widge
-
-    def _data(self):

django/trunk/django/newforms/widgets.py

@@ -4 +4 @@
-
-__all__ = (
-File
-
+MultipleHidden
+FileInput', '
-    'Select', 'SelectMultiple', 'RadioSelect', 'CheckboxSelectMultiple',
-)
@@ -87 +87 @@
-    input_type = 'hidden'
-    is_hidden = True
+
+class MultipleHiddenInput(HiddenInput):
+    """
+    A widget that handles <input type="hidden"> for fields that have a list
+    of values.
+    """
+    def render(self, name, value, attrs=None):
+        if value is None: value = []
+        final_attrs = self.build_attrs(attrs, type=self.input_type, name=name)
+        return u'\n'.join([(u'<input%s />' % flatatt(dict(value=smart_unicode(v), **final_attrs))) for v in value])
-
-class FileInput(Input):

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

@@ -1850 +1850 @@
-</select>
-
+MultipleChoiceField rendered as_hidden() is a special case. Because it can
+have multiple values, its as_hidden() renders multiple <input type="hidden">
+tags.
+>>> f = SongForm({'name': 'Yesterday', 'composers': ['P']}, auto_id=False)
+>>> print f['composers'].as_hidden()
+<input type="hidden" name="composers" value="P" />
+>>> f = SongForm({'name': 'From Me To You', 'composers': ['P', 'J']}, auto_id=False)
+>>> print f['composers'].as_hidden()
+<input type="hidden" name="composers" value="P" />
+<input type="hidden" name="composers" value="J" />
+
-MultipleChoiceField can also be used with the CheckboxSelectMultiple widget.
->>> class SongForm(Form):
@@ -1905 +1916 @@
->>> f.clean_data
-{'composers': [u'J', u'P'], 'name': u'Yesterday'}
+
+# Validating multiple fields in relation to another ###########################
-
-There are a couple of ways to do multiple-field validation. If you want the