p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refs #29131 -- Made ArrayField error messages index from 1 instead of 0.

This commit is contained in:
Hasan Ramezani 2018-04-23 06:48:46 +04:30 committed by Tim Graham
parent dd68b51e1d
commit b33f10d8cc
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/contrib/postgres/fields/array.py
View File

@ -160,7 +160,7 @@ class ArrayField(CheckFieldDefaultMixin, Field):
error, error,
prefix=self.error_messages['item_invalid'], prefix=self.error_messages['item_invalid'],
code='item_invalid', code='item_invalid',
params={'nth': index}, params={'nth': index + 1},
) )
if isinstance(self.base_field, ArrayField): if isinstance(self.base_field, ArrayField):
if len({len(i) for i in value}) > 1: if len({len(i) for i in value}) > 1:
@ -179,7 +179,7 @@ class ArrayField(CheckFieldDefaultMixin, Field):
error, error,
prefix=self.error_messages['item_invalid'], prefix=self.error_messages['item_invalid'],
code='item_invalid', code='item_invalid',
params={'nth': index}, params={'nth': index + 1},
) )
def formfield(self, **kwargs): def formfield(self, **kwargs):

8
django/contrib/postgres/forms/array.py
View File

@ -53,7 +53,7 @@ class SimpleArrayField(forms.CharField):
error, error,
prefix=self.error_messages['item_invalid'], prefix=self.error_messages['item_invalid'],
code='item_invalid', code='item_invalid',
params={'nth': index}, params={'nth': index + 1},
)) ))
if errors: if errors:
raise ValidationError(errors) raise ValidationError(errors)
@ -70,7 +70,7 @@ class SimpleArrayField(forms.CharField):
error, error,
prefix=self.error_messages['item_invalid'], prefix=self.error_messages['item_invalid'],
code='item_invalid', code='item_invalid',
params={'nth': index}, params={'nth': index + 1},
)) ))
if errors: if errors:
raise ValidationError(errors) raise ValidationError(errors)
@ -86,7 +86,7 @@ class SimpleArrayField(forms.CharField):
error, error,
prefix=self.error_messages['item_invalid'], prefix=self.error_messages['item_invalid'],
code='item_invalid', code='item_invalid',
params={'nth': index}, params={'nth': index + 1},
)) ))
if errors: if errors:
raise ValidationError(errors) raise ValidationError(errors)
@ -193,7 +193,7 @@ class SplitArrayField(forms.Field):
error, error,
self.error_messages['item_invalid'], self.error_messages['item_invalid'],
code='item_invalid', code='item_invalid',
params={'nth': index}, params={'nth': index + 1},
)) ))
cleaned_data.append(None) cleaned_data.append(None)
else: else:

32
tests/postgres_tests/test_array.py
View File

@ -600,7 +600,7 @@ class TestValidation(PostgreSQLTestCase):
self.assertEqual(cm.exception.code, 'item_invalid') self.assertEqual(cm.exception.code, 'item_invalid')
self.assertEqual( self.assertEqual(
cm.exception.message % cm.exception.params, cm.exception.message % cm.exception.params,
'Item 1 in the array did not validate: This field cannot be null.' 'Item 2 in the array did not validate: This field cannot be null.'
) )
def test_blank_true(self): def test_blank_true(self):
@ -631,10 +631,10 @@ class TestValidation(PostgreSQLTestCase):
exception = cm.exception.error_list[0] exception = cm.exception.error_list[0]
self.assertEqual( self.assertEqual(
exception.message, exception.message,
'Item 0 in the array did not validate: Ensure this value has at most 2 characters (it has 3).' 'Item 1 in the array did not validate: Ensure this value has at most 2 characters (it has 3).'
) )
self.assertEqual(exception.code, 'item_invalid') self.assertEqual(exception.code, 'item_invalid')
self.assertEqual(exception.params, {'nth': 0, 'value': 'abc', 'limit_value': 2, 'show_value': 3}) self.assertEqual(exception.params, {'nth': 1, 'value': 'abc', 'limit_value': 2, 'show_value': 3})
def test_with_validators(self): def test_with_validators(self):
field = ArrayField(models.IntegerField(validators=[validators.MinValueValidator(1)])) field = ArrayField(models.IntegerField(validators=[validators.MinValueValidator(1)]))
@ -645,10 +645,10 @@ class TestValidation(PostgreSQLTestCase):
exception = cm.exception.error_list[0] exception = cm.exception.error_list[0]
self.assertEqual( self.assertEqual(
exception.message, exception.message,
'Item 0 in the array did not validate: Ensure this value is greater than or equal to 1.' 'Item 1 in the array did not validate: Ensure this value is greater than or equal to 1.'
) )
self.assertEqual(exception.code, 'item_invalid') self.assertEqual(exception.code, 'item_invalid')
self.assertEqual(exception.params, {'nth': 0, 'value': 0, 'limit_value': 1, 'show_value': 0}) self.assertEqual(exception.params, {'nth': 1, 'value': 0, 'limit_value': 1, 'show_value': 0})
class TestSimpleFormField(PostgreSQLTestCase): class TestSimpleFormField(PostgreSQLTestCase):
@ -662,13 +662,13 @@ class TestSimpleFormField(PostgreSQLTestCase):
field = SimpleArrayField(forms.IntegerField()) field = SimpleArrayField(forms.IntegerField())
with self.assertRaises(exceptions.ValidationError) as cm: with self.assertRaises(exceptions.ValidationError) as cm:
field.clean('a,b,9') field.clean('a,b,9')
self.assertEqual(cm.exception.messages[0], 'Item 0 in the array did not validate: Enter a whole number.') self.assertEqual(cm.exception.messages[0], 'Item 1 in the array did not validate: Enter a whole number.')
def test_validate_fail(self): def test_validate_fail(self):
field = SimpleArrayField(forms.CharField(required=True)) field = SimpleArrayField(forms.CharField(required=True))
with self.assertRaises(exceptions.ValidationError) as cm: with self.assertRaises(exceptions.ValidationError) as cm:
field.clean('a,b,') field.clean('a,b,')
self.assertEqual(cm.exception.messages[0], 'Item 2 in the array did not validate: This field is required.') self.assertEqual(cm.exception.messages[0], 'Item 3 in the array did not validate: This field is required.')
def test_validate_fail_base_field_error_params(self): def test_validate_fail_base_field_error_params(self):
field = SimpleArrayField(forms.CharField(max_length=2)) field = SimpleArrayField(forms.CharField(max_length=2))
@ -679,23 +679,23 @@ class TestSimpleFormField(PostgreSQLTestCase):
first_error = errors[0] first_error = errors[0]
self.assertEqual( self.assertEqual(
first_error.message, first_error.message,
'Item 0 in the array did not validate: Ensure this value has at most 2 characters (it has 3).' 'Item 1 in the array did not validate: Ensure this value has at most 2 characters (it has 3).'
) )
self.assertEqual(first_error.code, 'item_invalid') self.assertEqual(first_error.code, 'item_invalid')
self.assertEqual(first_error.params, {'nth': 0, 'value': 'abc', 'limit_value': 2, 'show_value': 3}) self.assertEqual(first_error.params, {'nth': 1, 'value': 'abc', 'limit_value': 2, 'show_value': 3})
second_error = errors[1] second_error = errors[1]
self.assertEqual( self.assertEqual(
second_error.message, second_error.message,
'Item 2 in the array did not validate: Ensure this value has at most 2 characters (it has 4).' 'Item 3 in the array did not validate: Ensure this value has at most 2 characters (it has 4).'
) )
self.assertEqual(second_error.code, 'item_invalid') self.assertEqual(second_error.code, 'item_invalid')
self.assertEqual(second_error.params, {'nth': 2, 'value': 'defg', 'limit_value': 2, 'show_value': 4}) self.assertEqual(second_error.params, {'nth': 3, 'value': 'defg', 'limit_value': 2, 'show_value': 4})
def test_validators_fail(self): def test_validators_fail(self):
field = SimpleArrayField(forms.RegexField('[a-e]{2}')) field = SimpleArrayField(forms.RegexField('[a-e]{2}'))
with self.assertRaises(exceptions.ValidationError) as cm: with self.assertRaises(exceptions.ValidationError) as cm:
field.clean('a,bc,de') field.clean('a,bc,de')
self.assertEqual(cm.exception.messages[0], 'Item 0 in the array did not validate: Enter a valid value.') self.assertEqual(cm.exception.messages[0], 'Item 1 in the array did not validate: Enter a valid value.')
def test_delimiter(self): def test_delimiter(self):
field = SimpleArrayField(forms.CharField(), delimiter='|') field = SimpleArrayField(forms.CharField(), delimiter='|')
@ -819,10 +819,10 @@ class TestSplitFormField(PostgreSQLTestCase):
data = {'array_0': 'a', 'array_1': 'b', 'array_2': ''} data = {'array_0': 'a', 'array_1': 'b', 'array_2': ''}
form = SplitForm(data) form = SplitForm(data)
self.assertFalse(form.is_valid()) self.assertFalse(form.is_valid())
self.assertEqual(form.errors, {'array': ['Item 2 in the array did not validate: This field is required.']}) self.assertEqual(form.errors, {'array': ['Item 3 in the array did not validate: This field is required.']})
def test_invalid_integer(self): def test_invalid_integer(self):
msg = 'Item 1 in the array did not validate: Ensure this value is less than or equal to 100.' msg = 'Item 2 in the array did not validate: Ensure this value is less than or equal to 100.'
with self.assertRaisesMessage(exceptions.ValidationError, msg): with self.assertRaisesMessage(exceptions.ValidationError, msg):
SplitArrayField(forms.IntegerField(max_value=100), size=2).clean([0, 101]) SplitArrayField(forms.IntegerField(max_value=100), size=2).clean([0, 101])
@ -848,8 +848,8 @@ class TestSplitFormField(PostgreSQLTestCase):
with self.assertRaises(exceptions.ValidationError) as cm: with self.assertRaises(exceptions.ValidationError) as cm:
field.clean(['abc', 'c', 'defg']) field.clean(['abc', 'c', 'defg'])
self.assertEqual(cm.exception.messages, [ self.assertEqual(cm.exception.messages, [
'Item 0 in the array did not validate: Ensure this value has at most 2 characters (it has 3).', 'Item 1 in the array did not validate: Ensure this value has at most 2 characters (it has 3).',
'Item 2 in the array did not validate: Ensure this value has at most 2 characters (it has 4).', 'Item 3 in the array did not validate: Ensure this value has at most 2 characters (it has 4).',
]) ])
def test_splitarraywidget_value_omitted_from_data(self): def test_splitarraywidget_value_omitted_from_data(self):