p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

newforms: Abstracted common code in Form as_table(), as_ul() and as_p() into Form._html_output(). It's slightly obscure but saves on a lot of redundancy and code bloat. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@4179 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2006-12-07 06:59:07 +00:00
parent 7e269bd390
commit b4a67359a3
1 changed files with 22 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
django/newforms/forms.py
View File

@ -72,9 +72,9 @@ class Form(StrAndUnicode):
""" """
return not self.ignore_errors and not bool(self.errors) return not self.ignore_errors and not bool(self.errors)
def as_table(self): def _html_output(self, normal_row, error_row, row_ender, errors_on_separate_row):
"Returns this form rendered as HTML <tr>s -- excluding the <table></table>." "Helper function for outputting HTML. Used by as_table(), as_ul(), as_p()."
top_errors = self.non_field_errors() top_errors = self.non_field_errors() # Errors that should be displayed above all fields.
output, hidden_fields = [], [] output, hidden_fields = [], []
for name, field in self.fields.items(): for name, field in self.fields.items():
bf = BoundField(self, field, name) bf = BoundField(self, field, name)
@ -84,72 +84,36 @@ class Form(StrAndUnicode):
top_errors.extend(['(Hidden field %s) %s' % (name, e) for e in bf_errors]) top_errors.extend(['(Hidden field %s) %s' % (name, e) for e in bf_errors])
hidden_fields.append(unicode(bf)) hidden_fields.append(unicode(bf))
else: else:
if bf_errors: label = bf.label_tag(escape(bf.verbose_name+':'))
output.append(u'<tr><td colspan="2">%s</td></tr>' % bf_errors) if errors_on_separate_row:
output.append(u'<tr><td>%s</td><td>%s</td></tr>' % (bf.label_tag(escape(bf.verbose_name+':')), bf)) if bf_errors:
output.append(error_row % bf_errors)
output.append(normal_row % (label, bf))
else:
output.append(normal_row % ((bf_errors, label, bf)))
if top_errors: if top_errors:
output.insert(0, u'<tr><td colspan="2">%s</td></tr>' % top_errors) output.insert(0, error_row % top_errors)
if hidden_fields: # Insert any hidden fields in the last <td>. if hidden_fields: # Insert any hidden fields in the last row.
str_hidden = u''.join(hidden_fields) str_hidden = u''.join(hidden_fields)
if output: if output:
last_td = output[-1] last_row = output[-1]
# Chop off the trailing '</td></tr>' and insert the hidden fields. # Chop off the trailing row_ender (e.g. '</td></tr>') and insert the hidden fields.
output[-1] = last_td[:-10] + str_hidden + '</td></tr>' output[-1] = last_row[:-len(row_ender)] + str_hidden + row_ender
else: # If there aren't any '<td>'s in the output, just append the hidden fields. else: # If there aren't any rows in the output, just append the hidden fields.
output.append(str_hidden) output.append(str_hidden)
return u'\n'.join(output) return u'\n'.join(output)
def as_table(self):
"Returns this form rendered as HTML <tr>s -- excluding the <table></table>."
return self._html_output(u'<tr><td>%s</td><td>%s</td></tr>', u'<tr><td colspan="2">%s</td></tr>', '</td></tr>', True)
def as_ul(self): def as_ul(self):
"Returns this form rendered as HTML <li>s -- excluding the <ul></ul>." "Returns this form rendered as HTML <li>s -- excluding the <ul></ul>."
top_errors = self.non_field_errors() return self._html_output(u'<li>%s%s %s</li>', u'<li>%s</li>', '</li>', False)
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])
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 as_p(self): def as_p(self):
"Returns this form rendered as HTML <p>s." "Returns this form rendered as HTML <p>s."
top_errors = self.non_field_errors() return self._html_output(u'<p>%s %s</p>', u'<p>%s</p>', '</p>', True)
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])
hidden_fields.append(unicode(bf))
else:
if bf_errors:
output.append(u'<p>%s</p>' % bf_errors)
output.append(u'<p>%s %s</p>' % (bf.label_tag(escape(bf.verbose_name+':')), bf))
if top_errors:
output.insert(0, u'<p>%s</p>' % top_errors)
if hidden_fields: # Insert any hidden fields in the last <p>.
str_hidden = u''.join(hidden_fields)
if output:
last_td = output[-1]
# Chop off the trailing '</p>' and insert the hidden fields.
output[-1] = last_td[:-4] + str_hidden + '</p>'
else: # If there aren't any '<p>'s in the output, just append the hidden fields.
output.append(str_hidden)
return u'\n'.join(output)
def non_field_errors(self): def non_field_errors(self):
""" """