Changeset 4192

Timestamp:

12/10/06 20:38:18 (2 years ago)

Author:

adrian

Message:

newforms: Changed Form to use auto_id by default

Files:

• django/trunk/django/newforms/forms.py (modified) (1 diff)
• django/trunk/tests/regressiontests/forms/tests.py (modified) (40 diffs)

django/trunk/django/newforms/forms.py

@@ -37 +37 @@
-    __metaclass__ = DeclarativeFieldsMetaclass
-
-False
+'id_%s'
-        self.ignore_errors = data is None
-        self.data = data or {}

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

@@ -1328 +1328 @@
-{'first_name': u'John', 'last_name': u'Lennon', 'birthday': datetime.date(1940, 10, 9)}
->>> print p['first_name']
-
+id="id_first_name" 
->>> print p['last_name']
-
+id="id_last_name" 
->>> print p['birthday']
-
+id="id_birthday" 
->>> for boundfield in p:
-...     print boundfield
-
-
-
+id="id_first_name" 
+id="id_last_name" 
+id="id_birthday" 
->>> for boundfield in p:
-...     print boundfield.label, boundfield.data
@@ -1344 +1344 @@
-Birthday 1940-10-9
->>> print p
-First name:</td><td><input type="text" name="first_name" value="John
-Last name:</td><td><input type="text" name="last_name" value="Lennon
-Birthday:</td><td><input type="text" name="birthday" value="1940-10-9
+<label for="id_first_name">First name:</label></td><td><input type="text" name="first_name" value="John" id="id_first_name
+<label for="id_last_name">Last name:</label></td><td><input type="text" name="last_name" value="Lennon" id="id_last_name
+<label for="id_birthday">Birthday:</label></td><td><input type="text" name="birthday" value="1940-10-9" id="id_birthday
-
-Empty dictionaries are valid, too.
@@ -1356 +1356 @@
->>> print p
-<tr><td colspan="2"><ul class="errorlist"><li>This field is required.</li></ul></td></tr>
-First name:</td><td><input type="text" name="
+<label for="id_first_name">First name:</label></td><td><input type="text" name="first_name" id="id_
-<tr><td colspan="2"><ul class="errorlist"><li>This field is required.</li></ul></td></tr>
-Last name:</td><td><input type="text" name="
+<label for="id_last_name">Last name:</label></td><td><input type="text" name="last_name" id="id_
-<tr><td colspan="2"><ul class="errorlist"><li>This field is required.</li></ul></td></tr>
-Birthday:</td><td><input type="text" name="
+<label for="id_birthday">Birthday:</label></td><td><input type="text" name="birthday" id="id_
->>> print p.as_table()
-<tr><td colspan="2"><ul class="errorlist"><li>This field is required.</li></ul></td></tr>
-First name:</td><td><input type="text" name="
+<label for="id_first_name">First name:</label></td><td><input type="text" name="first_name" id="id_
-<tr><td colspan="2"><ul class="errorlist"><li>This field is required.</li></ul></td></tr>
-Last name:</td><td><input type="text" name="
+<label for="id_last_name">Last name:</label></td><td><input type="text" name="last_name" id="id_
-<tr><td colspan="2"><ul class="errorlist"><li>This field is required.</li></ul></td></tr>
-Birthday:</td><td><input type="text" name="
+<label for="id_birthday">Birthday:</label></td><td><input type="text" name="birthday" id="id_
->>> print p.as_ul()
-First name: <input type="text" name="
-Last name: <input type="text" name="
-Birthday: <input type="text" name="
+<label for="id_first_name">First name:</label> <input type="text" name="first_name" id="id_
+<label for="id_last_name">Last name:</label> <input type="text" name="last_name" id="id_
+<label for="id_birthday">Birthday:</label> <input type="text" name="birthday" id="id_
->>> print p.as_p()
-<p><ul class="errorlist"><li>This field is required.</li></ul></p>
-First name: <input type="text" name="
+<label for="id_first_name">First name:</label> <input type="text" name="first_name" id="id_
-<p><ul class="errorlist"><li>This field is required.</li></ul></p>
-Last name: <input type="text" name="
+<label for="id_last_name">Last name:</label> <input type="text" name="last_name" id="id_
-<p><ul class="errorlist"><li>This field is required.</li></ul></p>
-Birthday: <input type="text" name="
+<label for="id_birthday">Birthday:</label> <input type="text" name="birthday" id="id_
-
-If you don't pass any values to the Form's __init__(), or if you pass None,
@@ -1389 +1389 @@
-False
->>> print p
-First name:</td><td><input type="text" name="
-Last name:</td><td><input type="text" name="
-Birthday:</td><td><input type="text" name="
+<label for="id_first_name">First name:</label></td><td><input type="text" name="first_name" id="id_
+<label for="id_last_name">Last name:</label></td><td><input type="text" name="last_name" id="id_
+<label for="id_birthday">Birthday:</label></td><td><input type="text" name="birthday" id="id_
->>> print p.as_table()
-First name:</td><td><input type="text" name="
-Last name:</td><td><input type="text" name="
-Birthday:</td><td><input type="text" name="
+<label for="id_first_name">First name:</label></td><td><input type="text" name="first_name" id="id_
+<label for="id_last_name">Last name:</label></td><td><input type="text" name="last_name" id="id_
+<label for="id_birthday">Birthday:</label></td><td><input type="text" name="birthday" id="id_
->>> print p.as_ul()
-First name: <input type="text" name="
-Last name: <input type="text" name="
-Birthday: <input type="text" name="
+<label for="id_first_name">First name:</label> <input type="text" name="first_name" id="id_
+<label for="id_last_name">Last name:</label> <input type="text" name="last_name" id="id_
+<label for="id_birthday">Birthday:</label> <input type="text" name="birthday" id="id_
->>> print p.as_p()
-First name: <input type="text" name="
-Last name: <input type="text" name="
-Birthday: <input type="text" name="
+<label for="id_first_name">First name:</label> <input type="text" name="first_name" id="id_
+<label for="id_last_name">Last name:</label> <input type="text" name="last_name" id="id_
+<label for="id_birthday">Birthday:</label> <input type="text" name="birthday" id="id_
-
-Unicode values are handled properly.
->>> p = Person({'first_name': u'John', 'last_name': u'\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111', 'birthday': '1940-10-9'})
->>> p.as_table()
-First name:</td><td><input type="text" name="first_name" value="John" /></td></tr>\n<tr><td>Last name:</td><td><input type="text" name="last_name" value="\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111" /></td></tr>\n<tr><td>Birthday:</td><td><input type="text" name="birthday" value="1940-10-9
+<label for="id_first_name">First name:</label></td><td><input type="text" name="first_name" value="John" id="id_first_name" /></td></tr>\n<tr><td><label for="id_last_name">Last name:</label></td><td><input type="text" name="last_name" value="\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111" id="id_last_name" /></td></tr>\n<tr><td><label for="id_birthday">Birthday:</label></td><td><input type="text" name="birthday" value="1940-10-9" id="id_birthday
->>> p.as_ul()
-First name: <input type="text" name="first_name" value="John" /></li>\n<li>Last name: <input type="text" name="last_name" value="\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111" /></li>\n<li>Birthday: <input type="text" name="birthday" value="1940-10-9
+<label for="id_first_name">First name:</label> <input type="text" name="first_name" value="John" id="id_first_name" /></li>\n<li><label for="id_last_name">Last name:</label> <input type="text" name="last_name" value="\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111" id="id_last_name" /></li>\n<li><label for="id_birthday">Birthday:</label> <input type="text" name="birthday" value="1940-10-9" id="id_birthday
->>> p.as_p()
-First name: <input type="text" name="first_name" value="John" /></p>\n<p>Last name: <input type="text" name="last_name" value="\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111" /></p>\n<p>Birthday: <input type="text" name="birthday" value="1940-10-9
+<label for="id_first_name">First name:</label> <input type="text" name="first_name" value="John" id="id_first_name" /></p>\n<p><label for="id_last_name">Last name:</label> <input type="text" name="last_name" value="\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111" id="id_last_name" /></p>\n<p><label for="id_birthday">Birthday:</label> <input type="text" name="birthday" value="1940-10-9" id="id_birthday
-
->>> p = Person({'last_name': u'Lennon'})
@@ -1438 +1438 @@
->>> p = Person()
->>> print p['first_name']
-
+id="id_first_name" 
->>> print p['last_name']
-
+id="id_last_name" 
->>> print p['birthday']
-
+id="id_birthday" 
-
-"auto_id" tells the Form to add an "id" attribute to each form element.
@@ -1448 +1448 @@
-into which the field's name will be inserted. It will also put a <label> around
-the human-readable labels for a field.
-id_%s
+%s_id
->>> print p.as_table()
-id_first_name">First name:</label></td><td><input type="text" name="first_name" id="id_first_name
-id_last_name">Last name:</label></td><td><input type="text" name="last_name" id="id_last_name
-id_birthday">Birthday:</label></td><td><input type="text" name="birthday" id="id_birthday
+first_name_id">First name:</label></td><td><input type="text" name="first_name" id="first_name_id
+last_name_id">Last name:</label></td><td><input type="text" name="last_name" id="last_name_id
+birthday_id">Birthday:</label></td><td><input type="text" name="birthday" id="birthday_id
->>> print p.as_ul()
-id_first_name">First name:</label> <input type="text" name="first_name" id="id_first_name
-id_last_name">Last name:</label> <input type="text" name="last_name" id="id_last_name
-id_birthday">Birthday:</label> <input type="text" name="birthday" id="id_birthday
+first_name_id">First name:</label> <input type="text" name="first_name" id="first_name_id
+last_name_id">Last name:</label> <input type="text" name="last_name" id="last_name_id
+birthday_id">Birthday:</label> <input type="text" name="birthday" id="birthday_id
->>> print p.as_p()
-id_first_name">First name:</label> <input type="text" name="first_name" id="id_first_name
-id_last_name">Last name:</label> <input type="text" name="last_name" id="id_last_name
-id_birthday">Birthday:</label> <input type="text" name="birthday" id="id_birthday
+first_name_id">First name:</label> <input type="text" name="first_name" id="first_name_id
+last_name_id">Last name:</label> <input type="text" name="last_name" id="last_name_id
+birthday_id">Birthday:</label> <input type="text" name="birthday" id="birthday_id
-
-If auto_id is any True value whose str() does not contain '%s', the "id"
@@ -1501 +1501 @@
-...     email = EmailField()
-...     get_spam = BooleanField()
-
+auto_id=False
->>> print f['email']
-<input type="text" name="email" />
@@ -1507 +1507 @@
-<input type="checkbox" name="get_spam" />
-
-
+, auto_id=False
->>> print f['email']
-<input type="text" name="email" value="test@example.com" />
@@ -1517 +1517 @@
-...     subject = CharField()
-...     message = CharField(widget=Textarea)
-
+auto_id=False
->>> print f['subject']
-<input type="text" name="subject" />
@@ -1536 +1536 @@
-...     subject = CharField()
-...     message = CharField(widget=Textarea(attrs={'rows': 80, 'cols': 20}))
-
+auto_id=False
->>> print f['message']
-<textarea rows="80" cols="20" name="message"></textarea>
@@ -1544 +1544 @@
->>> f['message'].as_text()
-u'<input type="text" name="message" />'
-
+, auto_id=False
->>> f['subject'].as_textarea()
-u'<textarea name="subject">Hello</textarea>'
@@ -1556 +1556 @@
-...     name = CharField()
-...     language = ChoiceField(choices=[('P', 'Python'), ('J', 'Java')])
-
+auto_id=False
->>> print f['language']
-<select name="language">
@@ -1562 +1562 @@
-<option value="J">Java</option>
-</select>
-
+, auto_id=False
->>> print f['language']
-<select name="language">
@@ -1573 +1573 @@
-...     name = CharField()
-...     language = ChoiceField(choices=[('P', 'Python'), ('J', 'Java')], widget=RadioSelect)
-
+auto_id=False
->>> print f['language']
-<ul>
@@ -1628 +1628 @@
-...     name = CharField()
-...     composers = MultipleChoiceField()
-
+auto_id=False
->>> print f['composers']
-<select multiple="multiple" name="composers">
@@ -1635 +1635 @@
-...     name = CharField()
-...     composers = MultipleChoiceField(choices=[('J', 'John Lennon'), ('P', 'Paul McCartney')])
-
+auto_id=False
->>> print f['composers']
-<select multiple="multiple" name="composers">
@@ -1641 +1641 @@
-<option value="P">Paul McCartney</option>
-</select>
-
+, auto_id=False
->>> print f['name']
-<input type="text" name="name" value="Yesterday" />
@@ -1654 +1654 @@
-...     name = CharField()
-...     composers = MultipleChoiceField(choices=[('J', 'John Lennon'), ('P', 'Paul McCartney')], widget=CheckboxSelectMultiple)
-
+auto_id=False
->>> print f['composers']
-<ul>
@@ -1660 +1660 @@
-<li><label><input type="checkbox" name="composers" value="P" /> Paul McCartney</label></li>
-</ul>
-
+, auto_id=False
->>> print f['composers']
-<ul>
@@ -1666 +1666 @@
-<li><label><input type="checkbox" name="composers" value="P" /> Paul McCartney</label></li>
-</ul>
-
+, auto_id=False
->>> print f['composers']
-<ul>
@@ -1675 +1675 @@
-When using CheckboxSelectMultiple, the framework expects a list of input and
-returns a list of input.
-
+, auto_id=False
->>> f.errors
-{'composers': [u'This field is required.']}
-
+, auto_id=False
->>> f.errors
-{}
->>> f.clean_data
-{'composers': [u'J'], 'name': u'Yesterday'}
-
+, auto_id=False
->>> f.errors
-{}
@@ -1704 +1704 @@
-...            raise ValidationError(u'Please make sure your passwords match.')
-...        return self.clean_data['password2']
-
+auto_id=False
->>> f.errors
-{}
-
+, auto_id=False
->>> f.errors
-{'username': [u'This field is required.'], 'password1': [u'This field is required.'], 'password2': [u'This field is required.']}
-
+, auto_id=False
->>> f.errors
-{'password2': [u'Please make sure your passwords match.']}
-
+, auto_id=False
->>> f.errors
-{}
@@ -1734 +1734 @@
-...            raise ValidationError(u'Please make sure your passwords match.')
-...        return self.clean_data
-
+auto_id=False
->>> f.errors
-{}
-
+, auto_id=False
->>> print f.as_table()
-<tr><td colspan="2"><ul class="errorlist"><li>This field is required.</li></ul></td></tr>
@@ -1747 +1747 @@
->>> f.errors
-{'username': [u'This field is required.'], 'password1': [u'This field is required.'], 'password2': [u'This field is required.']}
-
+, auto_id=False
->>> f.errors
-{'__all__': [u'Please make sure your passwords match.']}
@@ -1760 +1760 @@
-<li>Password1: <input type="password" name="password1" value="foo" /></li>
-<li>Password2: <input type="password" name="password2" value="bar" /></li>
-
+, auto_id=False
->>> f.errors
-{}
@@ -1772 +1772 @@
-...     first_name = CharField()
-...     last_name = CharField()
-
-
+, *args, **kwargs
+*args, **kwargs
-...         self.fields['birthday'] = DateField()
-
+auto_id=False
->>> print p
-<tr><td>First name:</td><td><input type="text" name="first_name" /></td></tr>
@@ -1790 +1790 @@
-...     hidden_text = CharField(widget=HiddenInput)
-...     birthday = DateField()
-
+auto_id=False
->>> print p
-<tr><td>First name:</td><td><input type="text" name="first_name" /></td></tr>
@@ -1823 +1823 @@
-prepended. This message is displayed at the top of the output, regardless of
-its field's order in the form.
-
+, auto_id=False
->>> print p
-<tr><td colspan="2"><ul class="errorlist"><li>(Hidden field hidden_text) This field is required.</li></ul></td></tr>
@@ -1844 +1844 @@
-...     foo = CharField(widget=HiddenInput)
-...     bar = CharField(widget=HiddenInput)
-
+auto_id=False
->>> print p.as_table()
-<input type="hidden" name="foo" /><input type="hidden" name="bar" />
@@ -1868 +1868 @@
-...     field13 = CharField()
-...     field14 = CharField()
-
+auto_id=False
->>> print p
-<tr><td>Field1:</td><td><input type="text" name="field1" /></td></tr>
@@ -1894 +1894 @@
-...    realname = CharField(max_length=10, widget=TextInput) # redundantly define widget, just to test
-...    address = CharField()                                 # no max_length defined here
-
+auto_id=False
->>> print p.as_ul()
-<li>Username: <input type="text" name="username" maxlength="10" /></li>
@@ -1907 +1907 @@
-...    username = CharField(max_length=10, widget=TextInput(attrs={'maxlength': 20}))
-...    password = CharField(max_length=10, widget=PasswordInput)
-
+auto_id=False
->>> print p.as_ul()
-<li>Username: <input type="text" name="username" maxlength="10" /></li>
@@ -1919 +1919 @@
-...    password1 = CharField(widget=PasswordInput)
-...    password2 = CharField(widget=PasswordInput, label='Password (again)')
-
+auto_id=False
->>> print p.as_ul()
-<li>Your username: <input type="text" name="username" maxlength="10" /></li>
@@ -1938 +1938 @@
->>> def my_function(method, post_data):
-...     if method == 'POST':
-
+, auto_id=False
-...     else:
-
+auto_id=False
-...     if form.is_valid():
-...         return 'VALID: %r' % form.clean_data
@@ -1996 +1996 @@
-... <input type="submit" />
-... </form>''')
-
+auto_id=False
-<form action="">
-<p><label>Your username: <input type="text" name="username" maxlength="10" /></label></p>
@@ -2003 +2003 @@
-<input type="submit" />
-</form>
-
+, auto_id=False
-<form action="">
-<p><label>Your username: <input type="text" name="username" value="django" maxlength="10" /></label></p>
@@ -2021 +2021 @@
-... <input type="submit" />
-... </form>''')
-
+auto_id=False
-<form action="">
-<p><label>Username: <input type="text" name="username" maxlength="10" /></label></p>
@@ -2039 +2039 @@
-... <input type="submit" />
-... </form>''')
-
+auto_id=False
-<form action="">
-<p>Username: <input type="text" name="username" maxlength="10" /></p>
@@ -2064 +2064 @@
-... <input type="submit" />
-... </form>''')
-
+, auto_id=False
-<form action="">
-<p><label>Your username: <input type="text" name="username" value="django" maxlength="10" /></label></p>
@@ -2078 +2078 @@
-... <input type="submit" />
-... </form>''')
-
+, auto_id=False
-<form action="">
-<ul class="errorlist"><li>Please make sure your passwords match.</li></ul>