diff options
| author | Gabe Jackson <gabejackson@cxg.ch> | 2012-06-08 15:32:35 +0200 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2013-06-10 14:23:15 -0400 |
| commit | 584bd14dcfdee9585fec7794d53ce120ea73d0bc (patch) | |
| tree | 7303b054d610767073934793ae1223404444c9de /tests/admin_util | |
| parent | a643e4d200e12d1570174fec343a27d6bc47f735 (diff) | |
Fixed #18134 -- BoundField.label_tag now includes the form's label_suffix
There was an inconsistency between how the label_tag for forms were
generated depending on which method was used: as_p, as_ul and as_table
contained code to append the label_suffix where as label_tag called on a
form field directly did NOT append the label_suffix. The code for
appending the label_suffix has been moved in to the label_tag code of
the field and the HTML generation code for as_p, as_ul and as_table now
calls this code as well.
This is a backwards incompatible change because users who have added the
label_suffix manually in their templates may now get double label_suffix
characters in their forms.
Diffstat (limited to 'tests/admin_util')
| -rw-r--r-- | tests/admin_util/tests.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/admin_util/tests.py b/tests/admin_util/tests.py index 4a9a203f50..637f643261 100644 --- a/tests/admin_util/tests.py +++ b/tests/admin_util/tests.py @@ -301,7 +301,7 @@ class UtilTests(SimpleTestCase): self.assertHTMLEqual(helpers.AdminField(form, 'text', is_first=False).label_tag(), '<label for="id_text" class="required inline"><i>text</i>:</label>') self.assertHTMLEqual(helpers.AdminField(form, 'cb', is_first=False).label_tag(), - '<label for="id_cb" class="vCheckboxLabel required inline"><i>cb</i></label>') + '<label for="id_cb" class="vCheckboxLabel required inline"><i>cb</i>:</label>') # normal strings needs to be escaped class MyForm(forms.Form): @@ -312,7 +312,7 @@ class UtilTests(SimpleTestCase): self.assertHTMLEqual(helpers.AdminField(form, 'text', is_first=False).label_tag(), '<label for="id_text" class="required inline">&text:</label>') self.assertHTMLEqual(helpers.AdminField(form, 'cb', is_first=False).label_tag(), - '<label for="id_cb" class="vCheckboxLabel required inline">&cb</label>') + '<label for="id_cb" class="vCheckboxLabel required inline">&cb:</label>') def test_flatten_fieldsets(self): """ |