Django

Code

Changeset 5518

Show
Ignore:
Timestamp:
06/23/07 01:19:26 (1 year ago)
Author:
mtredinnick
Message:

Fixed #4527 -- Changed the way errors are displayed in Form.as_p() to avoid
invalid XHTML constructs. Based on a patch from SmileyChris?.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/newforms/forms.py

    r5348 r5518  
    160160    def as_p(self): 
    161161        "Returns this form rendered as HTML <p>s." 
    162         return self._html_output(u'<p>%(label)s %(field)s%(help_text)s</p>', u'<p>%s</p>', '</p>', u' %s', True) 
     162        return self._html_output(u'<p>%(label)s %(field)s%(help_text)s</p>', u'%s', '</p>', u' %s', True) 
    163163 
    164164    def non_field_errors(self): 

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

    r5515 r5518  
    19751975<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> 
    19761976>>> print p.as_p() 
    1977 <p><ul class="errorlist"><li>This field is required.</li></ul></p> 
     1977<ul class="errorlist"><li>This field is required.</li></ul> 
    19781978<p><label for="id_first_name">First name:</label> <input type="text" name="first_name" id="id_first_name" /></p> 
    1979 <p><ul class="errorlist"><li>This field is required.</li></ul></p> 
     1979<ul class="errorlist"><li>This field is required.</li></ul> 
    19801980<p><label for="id_last_name">Last name:</label> <input type="text" name="last_name" id="id_last_name" /></p> 
    1981 <p><ul class="errorlist"><li>This field is required.</li></ul></p> 
     1981<ul class="errorlist"><li>This field is required.</li></ul> 
    19821982<p><label for="id_birthday">Birthday:</label> <input type="text" name="birthday" id="id_birthday" /></p> 
    19831983 
    …… 
    26852685<li>Birthday: <input type="text" name="birthday" value="1940-10-9" /><input type="hidden" name="hidden_text" /></li> 
    26862686>>> print p.as_p() 
    2687 <p><ul class="errorlist"><li>(Hidden field hidden_text) This field is required.</li></ul></p> 
     2687<ul class="errorlist"><li>(Hidden field hidden_text) This field is required.</li></ul> 
    26882688<p>First name: <input type="text" name="first_name" value="John" /></p> 
    26892689<p>Last name: <input type="text" name="last_name" value="Lennon" /></p>