Fixed #20618 -- Fixed regression in BoundField.label_tag.

django · Jun 18, 2013 · 3128f3d · 3128f3d
1 parent ee77d4b
commit 3128f3d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/django/forms/forms.py b/django/forms/forms.py
@@ -518,9 +518,8 @@ def label_tag(self, contents=None, attrs=None):
         """
         contents = contents or self.label
         # Only add the suffix if the label does not end in punctuation.
-        if self.form.label_suffix:
+        if self.form.label_suffix and contents and contents[-1] not in ':?.!':
-            if contents[-1] not in ':?.!':
+            contents = format_html('{0}{1}', contents, self.form.label_suffix)
-                contents = format_html('{0}{1}', contents, self.form.label_suffix)
         widget = self.field.widget
         id_ = widget.attrs.get('id') or self.auto_id
         if id_:

diff --git a/tests/forms_tests/tests/test_forms.py b/tests/forms_tests/tests/test_forms.py
@@ -1863,3 +1863,10 @@ class SomeForm(Form):
         form = SomeForm()
         self.assertHTMLEqual(form['custom'].label_tag(), '<label for="custom_id_custom">Custom:</label>')
         self.assertHTMLEqual(form['empty'].label_tag(), '<label>Empty:</label>')
+
+    def test_boundfield_empty_label(self):
+        class SomeForm(Form):
+            field = CharField(label='')
+        boundfield = SomeForm()['field']
+
+        self.assertHTMLEqual(boundfield.label_tag(), '<label for="id_field"></label>')