Author: mtredinnick
Date: 2007-06-23 01:19:26 -0500 (Sat, 23 Jun 2007)
New Revision: 5518
Modified:
django/trunk/django/newforms/forms.py
django/trunk/tests/regressiontests/forms/tests.py
Log:
Fixed #4527 -- Changed the way errors are displayed in Form.as_p() to avoid
invalid XHTML constructs. Based on a patch from SmileyChris.
Modified: django/trunk/django/newforms/forms.py
===================================================================
--- django/trunk/django/newforms/forms.py 2007-06-23 06:02:17 UTC (rev
5517)
+++ django/trunk/django/newforms/forms.py 2007-06-23 06:19:26 UTC (rev
5518)
@@ -159,7 +159,7 @@
def as_p(self):
"Returns this form rendered as HTML <p>s."
- return self._html_output(u'<p>%(label)s %(field)s%(help_text)s</p>',
u'<p>%s</p>', '</p>', u' %s', True)
+ return self._html_output(u'<p>%(label)s %(field)s%(help_text)s</p>',
u'%s', '</p>', u' %s', True)
def non_field_errors(self):
"""
Modified: django/trunk/tests/regressiontests/forms/tests.py
===================================================================
--- django/trunk/tests/regressiontests/forms/tests.py 2007-06-23 06:02:17 UTC
(rev 5517)
+++ django/trunk/tests/regressiontests/forms/tests.py 2007-06-23 06:19:26 UTC
(rev 5518)
@@ -1974,11 +1974,11 @@
<li><ul class="errorlist"><li>This field is required.</li></ul><label
for="id_last_name">Last name:</label> <input type="text" name="last_name"
id="id_last_name" /></li>
<li><ul class="errorlist"><li>This field is required.</li></ul><label
for="id_birthday">Birthday:</label> <input type="text" name="birthday"
id="id_birthday" /></li>
>>> print p.as_p()
-<p><ul class="errorlist"><li>This field is required.</li></ul></p>
+<ul class="errorlist"><li>This field is required.</li></ul>
<p><label for="id_first_name">First name:</label> <input type="text"
name="first_name" id="id_first_name" /></p>
-<p><ul class="errorlist"><li>This field is required.</li></ul></p>
+<ul class="errorlist"><li>This field is required.</li></ul>
<p><label for="id_last_name">Last name:</label> <input type="text"
name="last_name" id="id_last_name" /></p>
-<p><ul class="errorlist"><li>This field is required.</li></ul></p>
+<ul class="errorlist"><li>This field is required.</li></ul>
<p><label for="id_birthday">Birthday:</label> <input type="text"
name="birthday" id="id_birthday" /></p>
If you don't pass any values to the Form's __init__(), or if you pass None,
@@ -2684,7 +2684,7 @@
<li>Last name: <input type="text" name="last_name" value="Lennon" /></li>
<li>Birthday: <input type="text" name="birthday" value="1940-10-9" /><input
type="hidden" name="hidden_text" /></li>
>>> print p.as_p()
-<p><ul class="errorlist"><li>(Hidden field hidden_text) This field is
required.</li></ul></p>
+<ul class="errorlist"><li>(Hidden field hidden_text) This field is
required.</li></ul>
<p>First name: <input type="text" name="first_name" value="John" /></p>
<p>Last name: <input type="text" name="last_name" value="Lennon" /></p>
<p>Birthday: <input type="text" name="birthday" value="1940-10-9" /><input
type="hidden" name="hidden_text" /></p>
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
