summaryrefslogtreecommitdiff
path: root/django/contrib/postgres/forms
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-10-26 19:37:47 -0400
committerTim Graham <timograham@gmail.com>2015-10-27 08:13:27 -0400
commit69e6045ceb18d859a1586bcd5e64f9b786d87c32 (patch)
tree01baff5ac92181dca86dc411dc6379b55328cec2 /django/contrib/postgres/forms
parent6b631b5c0bd88f7868308b966e8117b8da335669 (diff)
[1.8.x] Fixed #25597 -- Fixed crash with SplitArrayField and IntegerField on invalid value.
Backport of 1f07da3e29c7c3d47968e1c4531dd9bf902575b7 from master
Diffstat (limited to 'django/contrib/postgres/forms')
-rw-r--r--django/contrib/postgres/forms/array.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/postgres/forms/array.py b/django/contrib/postgres/forms/array.py
index 01c4d53527..e4c848424a 100644
--- a/django/contrib/postgres/forms/array.py
+++ b/django/contrib/postgres/forms/array.py
@@ -166,7 +166,7 @@ class SplitArrayField(forms.Field):
errors.append(None)
except ValidationError as error:
errors.append(ValidationError(
- string_concat(self.error_messages['item_invalid'], error.message),
+ string_concat(self.error_messages['item_invalid'], ' '.join(error.messages)),
code='item_invalid',
params={'nth': i},
))