mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 22:26:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #3101 -- newforms: Form.as_table() no longer puts hidden fields between <tr>s. Thanks for reporting, Eric

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4175 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty
2006-12-07 06:06:58 +00:00
parent 88f1dd31b7
commit 300f26deff
2 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
django/newforms/forms.py
View File

@@ -75,20 +75,28 @@ class Form(StrAndUnicode):
def as_table(self):
"Returns this form rendered as HTML <tr>s -- excluding the <table></table>."
top_errors = self.non_field_errors()
output = []
output, hidden_fields = [], []
for name, field in self.fields.items():
bf = BoundField(self, field, name)
bf_errors = bf.errors # Cache in local variable.
if bf.is_hidden:
if bf_errors:
top_errors.extend(['(Hidden field %s) %s' % (name, e) for e in bf_errors])
output.append(str(bf))
hidden_fields.append(str(bf))
else:
if bf_errors:
output.append(u'<tr><td colspan="2">%s</td></tr>' % bf_errors)
output.append(u'<tr><td>%s</td><td>%s</td></tr>' % (bf.label_tag(escape(bf.verbose_name+':')), bf))
if top_errors:
output.insert(0, u'<tr><td colspan="2">%s</td></tr>' % top_errors)
if hidden_fields: # Insert any hidden fields in the last <td>.
str_hidden = u''.join(hidden_fields)
if output:
last_td = output[-1]
# Chop off the trailing '</td></tr>' and insert the hidden fields.
output[-1] = last_td[:-10] + str_hidden + '</td></tr>'
else: # If there aren't any '<td>'s in the output, just append the hidden fields.
output.append(str_hidden)
return u'\n'.join(output)
def as_ul(self):