Django

Code

Changeset 4239

Show
Ignore:
Timestamp:
12/26/06 17:16:16 (2 years ago)
Author:
adrian
Message:

newforms: Changed Form.as_table() to display errors in same <td> as the field

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r4235 r4239  
    115115    def as_table(self): 
    116116        "Returns this form rendered as HTML <tr>s -- excluding the <table></table>." 
    117         return self._html_output(u'<tr><th>%(label)s</th><td>%(field)s</td></tr>', u'<tr><td colspan="2">%s</td></tr>', '</td></tr>', True) 
     117        return self._html_output(u'<tr><th>%(label)s</th><td>%(errors)s%(field)s</td></tr>', u'<tr><td colspan="2">%s</td></tr>', '</td></tr>', False) 
    118118 
    119119    def as_ul(self): 

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

    r4238 r4239  
    14951495False 
    14961496>>> print p 
    1497 <tr><td colspan="2"><ul class="errorlist"><li>This field is required.</li></ul></td></tr> 
    1498 <tr><th><label for="id_first_name">First name:</label></th><td><input type="text" name="first_name" id="id_first_name" /></td></tr> 
    1499 <tr><td colspan="2"><ul class="errorlist"><li>This field is required.</li></ul></td></tr> 
    1500 <tr><th><label for="id_last_name">Last name:</label></th><td><input type="text" name="last_name" id="id_last_name" /></td></tr> 
    1501 <tr><td colspan="2"><ul class="errorlist"><li>This field is required.</li></ul></td></tr> 
    1502 <tr><th><label for="id_birthday">Birthday:</label></th><td><input type="text" name="birthday" id="id_birthday" /></td></tr> 
     1497<tr><th><label for="id_first_name">First name:</label></th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="text" name="first_name" id="id_first_name" /></td></tr> 
     1498<tr><th><label for="id_last_name">Last name:</label></th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="text" name="last_name" id="id_last_name" /></td></tr> 
     1499<tr><th><label for="id_birthday">Birthday:</label></th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="text" name="birthday" id="id_birthday" /></td></tr> 
    15031500>>> print p.as_table() 
    1504 <tr><td colspan="2"><ul class="errorlist"><li>This field is required.</li></ul></td></tr> 
    1505 <tr><th><label for="id_first_name">First name:</label></th><td><input type="text" name="first_name" id="id_first_name" /></td></tr> 
    1506 <tr><td colspan="2"><ul class="errorlist"><li>This field is required.</li></ul></td></tr> 
    1507 <tr><th><label for="id_last_name">Last name:</label></th><td><input type="text" name="last_name" id="id_last_name" /></td></tr> 
    1508 <tr><td colspan="2"><ul class="errorlist"><li>This field is required.</li></ul></td></tr> 
    1509 <tr><th><label for="id_birthday">Birthday:</label></th><td><input type="text" name="birthday" id="id_birthday" /></td></tr> 
     1501<tr><th><label for="id_first_name">First name:</label></th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="text" name="first_name" id="id_first_name" /></td></tr> 
     1502<tr><th><label for="id_last_name">Last name:</label></th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="text" name="last_name" id="id_last_name" /></td></tr> 
     1503<tr><th><label for="id_birthday">Birthday:</label></th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="text" name="birthday" id="id_birthday" /></td></tr> 
    15101504>>> print p.as_ul() 
    15111505<li><ul class="errorlist"><li>This field is required.</li></ul><label for="id_first_name">First name:</label> <input type="text" name="first_name" id="id_first_name" /></li> 
    …… 
    18961890>>> f = UserRegistration({}, auto_id=False) 
    18971891>>> print f.as_table() 
    1898 <tr><td colspan="2"><ul class="errorlist"><li>This field is required.</li></ul></td></tr> 
    1899 <tr><th>Username:</th><td><input type="text" name="username" maxlength="10" /></td></tr> 
    1900 <tr><td colspan="2"><ul class="errorlist"><li>This field is required.</li></ul></td></tr> 
    1901 <tr><th>Password1:</th><td><input type="password" name="password1" /></td></tr> 
    1902 <tr><td colspan="2"><ul class="errorlist"><li>This field is required.</li></ul></td></tr> 
    1903 <tr><th>Password2:</th><td><input type="password" name="password2" /></td></tr> 
     1892<tr><th>Username:</th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="text" name="username" maxlength="10" /></td></tr> 
     1893<tr><th>Password1:</th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="password" name="password1" /></td></tr> 
     1894<tr><th>Password2:</th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="password" name="password2" /></td></tr> 
    19041895>>> f.errors 
    19051896{'username': [u'This field is required.'], 'password1': [u'This field is required.'], 'password2': [u'This field is required.']} 
    …… 
    22382229<table> 
    22392230<tr><td colspan="2"><ul class="errorlist"><li>Please make sure your passwords match.</li></ul></td></tr> 
    2240 <tr><td colspan="2"><ul class="errorlist"><li>Ensure this value has at most 10 characters.</li></ul></td></tr> 
    2241 <tr><th>Username:</th><td><input type="text" name="username" value="this-is-a-long-username" maxlength="10" /></td></tr> 
     2231<tr><th>Username:</th><td><ul class="errorlist"><li>Ensure this value has at most 10 characters.</li></ul><input type="text" name="username" value="this-is-a-long-username" maxlength="10" /></td></tr> 
    22422232<tr><th>Password1:</th><td><input type="password" name="password1" value="foo" /></td></tr> 
    22432233<tr><th>Password2:</th><td><input type="password" name="password2" value="bar" /></td></tr>