...
`` instead of
``...
`` to allow any kind of HTML as the field's content.
+.. _template-widget-incompatibilities-1-11:
+
+Changes due to the introduction of template-based widget rendering
+------------------------------------------------------------------
+
+Some undocumented classes in ``django.forms.widgets`` are removed:
+
+* ``SubWidget``
+* ``RendererMixin``, ``ChoiceFieldRenderer``, ``RadioFieldRenderer``,
+ ``CheckboxFieldRenderer``
+* ``ChoiceInput``, ``RadioChoiceInput``, ``CheckboxChoiceInput``
+
+The ``Widget.format_output()`` method is removed. Use a custom widget template
+instead.
+
Miscellaneous
-------------
@@ -754,3 +778,7 @@ Miscellaneous
entries for search engines, for example. An alternative solution could be to
create a :data:`~django.conf.urls.handler404` that looks for uppercase
characters in the URL and redirects to a lowercase equivalent.
+
+* The ``renderer`` argument is added to the :meth:`Widget.render()
+ ` method. Methods that don't accept that argument
+ will work through a deprecation period.
diff --git a/docs/spelling_wordlist b/docs/spelling_wordlist
index 8405db76dc..ce3c4c23ad 100644
--- a/docs/spelling_wordlist
+++ b/docs/spelling_wordlist
@@ -673,6 +673,7 @@ releasers
reloader
removetags
renderer
+renderers
repo
reportable
reprojection
diff --git a/tests/admin_inlines/tests.py b/tests/admin_inlines/tests.py
index 2716d2abdb..6922a9f82f 100644
--- a/tests/admin_inlines/tests.py
+++ b/tests/admin_inlines/tests.py
@@ -184,9 +184,11 @@ class TestInline(TestDataMixin, TestCase):
SomeChildModel.objects.create(name='c', position='1', parent=parent)
response = self.client.get(reverse('admin:admin_inlines_someparentmodel_change', args=(parent.pk,)))
self.assertNotContains(response, '')
- self.assertContains(response, (
+ self.assertInHTML(
']+>([^>]+)')
w = widgets.AdminURLFieldWidget()
+ output = w.render('test', 'http://example.com/some text ')
self.assertEqual(
- w.render('test', 'http://example.com/some text '),
- 'Currently: '
- ''
- 'http://example.com/<sometag>some text</sometag>
'
+ HREF_RE.search(output).groups()[0],
+ 'http://example.com/%3Csometag%3Esome%20text%3C/sometag%3E',
)
self.assertEqual(
- w.render('test', 'http://example-äüö.com/some text '),
- 'Currently: '
- ''
- 'http://example-äüö.com/<sometag>some text</sometag>
'
+ TEXT_RE.search(output).groups()[0],
+ 'http://example.com/<sometag>some text</sometag>',
)
self.assertEqual(
- w.render('test', 'http://www.example.com/%C3%A4">"'),
- 'Currently: '
- ''
+ VALUE_RE.search(output).groups()[0],
+ 'http://example.com/<sometag>some text</sometag>',
+ )
+ output = w.render('test', 'http://example-äüö.com/some text ')
+ self.assertEqual(
+ HREF_RE.search(output).groups()[0],
+ 'http://xn--example--7za4pnc.com/%3Csometag%3Esome%20text%3C/sometag%3E',
+ )
+ self.assertEqual(
+ TEXT_RE.search(output).groups()[0],
+ 'http://example-äüö.com/<sometag>some text</sometag>',
+ )
+ self.assertEqual(
+ VALUE_RE.search(output).groups()[0],
+ 'http://example-äüö.com/<sometag>some text</sometag>',
+ )
+ output = w.render('test', 'http://www.example.com/%C3%A4">"')
+ self.assertEqual(
+ HREF_RE.search(output).groups()[0],
+ 'http://www.example.com/%C3%A4%22%3E%3Cscript%3Ealert(%22XSS!%22)%3C/script%3E%22',
+ )
+ self.assertEqual(
+ TEXT_RE.search(output).groups()[0],
'http://www.example.com/%C3%A4"><script>'
- 'alert("XSS!")</script>"
'
+ 'alert("XSS!")</script>"'
+ )
+ self.assertEqual(
+ VALUE_RE.search(output).groups()[0],
+ 'http://www.example.com/%C3%A4"><script>alert("XSS!")</script>"',
)
diff --git a/tests/forms_tests/field_tests/test_filepathfield.py b/tests/forms_tests/field_tests/test_filepathfield.py
index 5c4bd1bbb2..d518e65db1 100644
--- a/tests/forms_tests/field_tests/test_filepathfield.py
+++ b/tests/forms_tests/field_tests/test_filepathfield.py
@@ -39,6 +39,7 @@ class FilePathFieldTest(SimpleTestCase):
('/django/forms/forms.py', 'forms.py'),
('/django/forms/formsets.py', 'formsets.py'),
('/django/forms/models.py', 'models.py'),
+ ('/django/forms/renderers.py', 'renderers.py'),
('/django/forms/utils.py', 'utils.py'),
('/django/forms/widgets.py', 'widgets.py')
]
@@ -62,6 +63,7 @@ class FilePathFieldTest(SimpleTestCase):
('/django/forms/forms.py', 'forms.py'),
('/django/forms/formsets.py', 'formsets.py'),
('/django/forms/models.py', 'models.py'),
+ ('/django/forms/renderers.py', 'renderers.py'),
('/django/forms/utils.py', 'utils.py'),
('/django/forms/widgets.py', 'widgets.py')
]
@@ -83,6 +85,7 @@ class FilePathFieldTest(SimpleTestCase):
('/django/forms/forms.py', 'forms.py'),
('/django/forms/formsets.py', 'formsets.py'),
('/django/forms/models.py', 'models.py'),
+ ('/django/forms/renderers.py', 'renderers.py'),
('/django/forms/utils.py', 'utils.py'),
('/django/forms/widgets.py', 'widgets.py')
]
diff --git a/tests/forms_tests/jinja2/forms_tests/custom_widget.html b/tests/forms_tests/jinja2/forms_tests/custom_widget.html
new file mode 100644
index 0000000000..c6e8abd4ad
--- /dev/null
+++ b/tests/forms_tests/jinja2/forms_tests/custom_widget.html
@@ -0,0 +1 @@
+
"""
)
+ def test_form_with_iterable_boundfield_id(self):
+ class BeatleForm(Form):
+ name = ChoiceField(
+ choices=[('john', 'John'), ('paul', 'Paul'), ('george', 'George'), ('ringo', 'Ringo')],
+ widget=RadioSelect,
+ )
+ fields = list(BeatleForm()['name'])
+ self.assertEqual(len(fields), 4)
+
+ self.assertEqual(fields[0].id_for_label, 'id_name_0')
+ self.assertEqual(fields[0].choice_label, 'John')
+ self.assertHTMLEqual(
+ fields[0].tag(),
+ 'John ')
+ self.assertHTMLEqual(str(fields[0]), 'John ')
+
def test_form_with_noniterable_boundfield(self):
# You can iterate over any BoundField, not just those with widget=RadioSelect.
class BeatleForm(Form):
@@ -1993,8 +2038,9 @@ Password: %s %s
' % (inp.tag(), inp.choice_label))
- inp_set4.append(
- '%s %s %s %s %s' % (
- inp.name,
- inp.value,
- inp.choice_value,
- inp.choice_label,
- inp.is_checked(),
- )
- )
-
- self.assertHTMLEqual('\n'.join(inp_set1), """
-
-
-
""")
- self.assertHTMLEqual('\n'.join(inp_set4), """beatle J J John True
-beatle J P Paul False
-beatle J G George False
-beatle J R Ringo False""")
-
- # A RadioFieldRenderer object also allows index access to individual RadioChoiceInput
- w = RadioSelect(choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo')))
- r = w.get_renderer('beatle', 'J')
- self.assertHTMLEqual(str(r[1]), '{content}')
- inner_html = '{choice_value}{sub_widgets}
'
- w = RadioSelect(choices=(('J', 'John'), ('P', 'Paul'), ('G', 'George'), ('R', 'Ringo')), renderer=MyRenderer)
- output = w.render('beatle', 'J', attrs={'id': 'bar'})
- self.assertIsInstance(output, SafeData)
- self.assertHTMLEqual(
- output,
- """""")
-
- def test_subwidget(self):
- # Each subwidget tag gets a separate ID when the widget has an ID specified
- self.assertHTMLEqual(
- "\n".join(
- c.tag() for c in CheckboxSelectMultiple(
- attrs={'id': 'abc'},
- choices=zip('abc', 'ABC')
- ).subwidgets('letters', list('ac'))
- ),
- """Clear 
+
+ {% endif %}
+ {% if can_add_related %}
+
+ 
+
+ {% endif %}
+ {% if can_delete_related %}
+
+ 
+
+ {% endif %}
+ {% endblock %}
+