diff options
| author | Nick Pope <nick.pope@flightdataservices.com> | 2017-12-05 14:42:10 +0000 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-12-05 11:44:39 -0500 |
| commit | 47681af34447e5d45f3fdb316497cdf9fbd0b7ce (patch) | |
| tree | dbd9bf46f22a95530a1343492ceda6d4283610cb | |
| parent | 9ca5ff7996e7539b83dfd9e799ac28014ea422a6 (diff) | |
[1.11.x] Fixed #28890 -- Removed newlines between MultiWidget's subwidgets.
Regression in b52c73008a9d67e9ddbb841872dc15cdd3d6ee01.
Backport of e014f91a70aa3ccdddb363a733c76e35597424fa from master
4 files changed, 11 insertions, 3 deletions
diff --git a/django/forms/jinja2/django/forms/widgets/multiwidget.html b/django/forms/jinja2/django/forms/widgets/multiwidget.html index 0030711182..ae120e91f5 100644 --- a/django/forms/jinja2/django/forms/widgets/multiwidget.html +++ b/django/forms/jinja2/django/forms/widgets/multiwidget.html @@ -1 +1 @@ -{% for widget in widget.subwidgets %}{% include widget.template_name %}{% endfor %} +{% for widget in widget.subwidgets -%}{% include widget.template_name %}{%- endfor %} diff --git a/django/forms/templates/django/forms/widgets/multiwidget.html b/django/forms/templates/django/forms/widgets/multiwidget.html index 0030711182..7e687a136b 100644 --- a/django/forms/templates/django/forms/widgets/multiwidget.html +++ b/django/forms/templates/django/forms/widgets/multiwidget.html @@ -1 +1 @@ -{% for widget in widget.subwidgets %}{% include widget.template_name %}{% endfor %} +{% spaceless %}{% for widget in widget.subwidgets %}{% include widget.template_name %}{% endfor %}{% endspaceless %} diff --git a/docs/releases/1.11.9.txt b/docs/releases/1.11.9.txt index 851f1f64c1..20d587248f 100644 --- a/docs/releases/1.11.9.txt +++ b/docs/releases/1.11.9.txt @@ -9,4 +9,5 @@ Django 1.11.9 fixes several bugs in 1.11.8. Bugfixes ======== -* ... +* Fixed a regression in Django 1.11 that added newlines between ``MultiWidget``'s + subwidgets (:ticket:`28890`). diff --git a/tests/forms_tests/widget_tests/test_multiwidget.py b/tests/forms_tests/widget_tests/test_multiwidget.py index 02cbe10c7c..e1f3eedd68 100644 --- a/tests/forms_tests/widget_tests/test_multiwidget.py +++ b/tests/forms_tests/widget_tests/test_multiwidget.py @@ -168,6 +168,13 @@ class MultiWidgetTest(WidgetTest): """ )) + def test_no_whitespace_between_widgets(self): + widget = MyMultiWidget(widgets=(TextInput, TextInput())) + self.check_html(widget, 'code', None, html=( + '<input type="text" name="code_0" />' + '<input type="text" name="code_1" />' + ), strict=True) + def test_deepcopy(self): """ MultiWidget should define __deepcopy__() (#12048). |