diff options
| author | Brandon Chinn <brandonchinn178@gmail.com> | 2016-11-11 17:07:15 -0800 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-11-15 18:10:45 -0500 |
| commit | 6573274161ee589e89077192239e0bd01cbd692a (patch) | |
| tree | 2c6ae810625958d7ed2d32be429af0bb6805b2af | |
| parent | 74ed20b49ade9f1cbd9af294e35478d8e0f59344 (diff) | |
Refs #27003 -- Fixed SimpleArrayField crash on converted values.
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | django/contrib/postgres/forms/array.py | 4 | ||||
| -rw-r--r-- | tests/postgres_tests/test_array.py | 5 |
3 files changed, 9 insertions, 1 deletions
@@ -110,6 +110,7 @@ answer newbie questions, and generally made Django that much better: Bouke Haarsma <bouke@haarsma.eu> Božidar Benko <bbenko@gmail.com> Brad Melin <melinbrad@gmail.com> + Brandon Chinn <http://brandonchinn178.github.io> Brant Harris Brendan Hayward <brendanhayward85@gmail.com> Brenton Simpson <http://theillustratedlife.com> diff --git a/django/contrib/postgres/forms/array.py b/django/contrib/postgres/forms/array.py index bd3daaae0b..d22d9081e2 100644 --- a/django/contrib/postgres/forms/array.py +++ b/django/contrib/postgres/forms/array.py @@ -35,7 +35,9 @@ class SimpleArrayField(forms.CharField): return value def to_python(self, value): - if value: + if isinstance(value, list): + items = value + elif value: items = value.split(self.delimiter) else: items = [] diff --git a/tests/postgres_tests/test_array.py b/tests/postgres_tests/test_array.py index db67ab714e..886a983180 100644 --- a/tests/postgres_tests/test_array.py +++ b/tests/postgres_tests/test_array.py @@ -677,6 +677,11 @@ class TestSimpleFormField(PostgreSQLTestCase): self.assertIsInstance(form_field, SimpleArrayField) self.assertEqual(form_field.max_length, 4) + def test_already_converted_value(self): + field = SimpleArrayField(forms.CharField()) + vals = ['a', 'b', 'c'] + self.assertEqual(field.clean(vals), vals) + class TestSplitFormField(PostgreSQLTestCase): |