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

newforms: Form.as_ul() no longer puts hidden fields between <li>s. Similar to [4175], which was the same thing for Form.as_table(). Refs #3101

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4177 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty
2006-12-07 06:17:06 +00:00
parent 3d1ceab1aa
commit 44add112e5
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
django/newforms/forms.py
View File

@@ -102,18 +102,26 @@ class Form(StrAndUnicode):
def as_ul(self):
"Returns this form rendered as HTML <li>s -- excluding the <ul></ul>."
top_errors = self.non_field_errors()
output = []
output, hidden_fields = [], []
for name, field in self.fields.items():
bf = BoundField(self, field, name)
if bf.is_hidden:
new_errors = bf.errors # Cache in local variable.
if new_errors:
top_errors.extend(['(Hidden field %s) %s' % (name, e) for e in new_errors])
output.append(unicode(bf))
hidden_fields.append(unicode(bf))
else:
output.append(u'<li>%s%s %s</li>' % (bf.errors, bf.label_tag(escape(bf.verbose_name+':')), bf))
if top_errors:
output.insert(0, u'<li>%s</li>' % top_errors)
if hidden_fields: # Insert any hidden fields in the last <li>.
str_hidden = u''.join(hidden_fields)
if output:
last_li = output[-1]
# Chop off the trailing '</li>' and insert the hidden fields.
output[-1] = last_li[:-5] + str_hidden + '</li>'
else: # If there aren't any '<li>'s in the output, just append the hidden fields.
output.append(str_hidden)
return u'\n'.join(output)
def non_field_errors(self):