summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Andersen <peter@porksmash.com>2019-12-09 08:54:40 -0800
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2019-12-11 09:38:49 +0100
commitf33be1e8ae2efbca5f209e2365fa35c2aaee340c (patch)
treeddfba23bf5a4e53d0b6f255b8d84ee95ca14bfff
parente8b0903976077b951795938b260211214ed7fe41 (diff)
[2.2.x] Fixed #31073 -- Prevented CheckboxInput.get_context() from mutating attrs.
Backport of 02eff7ef60466da108b1a33f1e4dc01eec45c99d from master
-rw-r--r--django/forms/widgets.py4
-rw-r--r--tests/forms_tests/widget_tests/test_checkboxinput.py5
-rw-r--r--tests/postgres_tests/test_array.py11
3 files changed, 17 insertions, 3 deletions
diff --git a/django/forms/widgets.py b/django/forms/widgets.py
index e944091f0d..8cd33c439a 100644
--- a/django/forms/widgets.py
+++ b/django/forms/widgets.py
@@ -522,9 +522,7 @@ class CheckboxInput(Input):
def get_context(self, name, value, attrs):
if self.check_test(value):
- if attrs is None:
- attrs = {}
- attrs['checked'] = True
+ attrs = {**(attrs or {}), 'checked': True}
return super().get_context(name, value, attrs)
def value_from_datadict(self, data, files, name):
diff --git a/tests/forms_tests/widget_tests/test_checkboxinput.py b/tests/forms_tests/widget_tests/test_checkboxinput.py
index 6483b7f211..8dba2178c9 100644
--- a/tests/forms_tests/widget_tests/test_checkboxinput.py
+++ b/tests/forms_tests/widget_tests/test_checkboxinput.py
@@ -89,3 +89,8 @@ class CheckboxInputTest(WidgetTest):
def test_value_omitted_from_data(self):
self.assertIs(self.widget.value_omitted_from_data({'field': 'value'}, {}, 'field'), False)
self.assertIs(self.widget.value_omitted_from_data({}, {}, 'field'), False)
+
+ def test_get_context_does_not_mutate_attrs(self):
+ attrs = {'checked': False}
+ self.widget.get_context('name', True, attrs)
+ self.assertIs(attrs['checked'], False)
diff --git a/tests/postgres_tests/test_array.py b/tests/postgres_tests/test_array.py
index 447d511c9f..021c58b6fd 100644
--- a/tests/postgres_tests/test_array.py
+++ b/tests/postgres_tests/test_array.py
@@ -917,6 +917,17 @@ class TestSplitFormWidget(PostgreSQLWidgetTestCase):
}
)
+ def test_checkbox_get_context_attrs(self):
+ context = SplitArrayWidget(
+ forms.CheckboxInput(),
+ size=2,
+ ).get_context('name', [True, False])
+ self.assertEqual(context['widget']['value'], '[True, False]')
+ self.assertEqual(
+ [subwidget['attrs'] for subwidget in context['widget']['subwidgets']],
+ [{'checked': True}, {}]
+ )
+
def test_render(self):
self.check_html(
SplitArrayWidget(forms.TextInput(), size=2), 'array', None,