encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-04 12:30:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

make changes based on review

Browse Source
This commit is contained in:
Vignesh 2017-09-23 02:15:38 +08:00 committed by Carlton Gibson
parent 56daa693df
commit 5019494042
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rest_framework/utils/field_mapping.py
View File

@ -127,13 +127,13 @@ def get_field_kwargs(field_name, model_field):
else: else:
# Ensure that max_value is passed explicitly as a keyword arg, # Ensure that max_value is passed explicitly as a keyword arg,
# rather than as a validator. # rather than as a validator.
max_value, messsage = next(( max_value, message = next((
(validator.limit_value, validator.message) for validator in validator_kwarg (validator.limit_value, validator.message) for validator in validator_kwarg
if isinstance(validator, validators.MaxValueValidator) if isinstance(validator, validators.MaxValueValidator)
), (None, None)) ), (None, None))
if max_value is not None and isinstance(model_field, NUMERIC_FIELD_TYPES): if max_value is not None and isinstance(model_field, NUMERIC_FIELD_TYPES):
kwargs['max_value'] = max_value kwargs['max_value'] = max_value
kwargs['error_messages'] = {'max_value': messsage} kwargs['error_messages'] = {'max_value': message}
validator_kwarg = [ validator_kwarg = [
validator for validator in validator_kwarg validator for validator in validator_kwarg
if not isinstance(validator, validators.MaxValueValidator) if not isinstance(validator, validators.MaxValueValidator)
@ -141,13 +141,13 @@ def get_field_kwargs(field_name, model_field):
# Ensure that min_value is passed explicitly as a keyword arg, # Ensure that min_value is passed explicitly as a keyword arg,
# rather than as a validator. # rather than as a validator.
min_value, messsage = next(( min_value, message = next((
(validator.limit_value, validator.message) for validator in validator_kwarg (validator.limit_value, validator.message) for validator in validator_kwarg
if isinstance(validator, validators.MinValueValidator) if isinstance(validator, validators.MinValueValidator)
), (None, None)) ), (None, None))
if min_value is not None and isinstance(model_field, NUMERIC_FIELD_TYPES): if min_value is not None and isinstance(model_field, NUMERIC_FIELD_TYPES):
kwargs['min_value'] = min_value kwargs['min_value'] = min_value
kwargs['error_messages'] = {**kwargs['error_messages'], **{'min_value': messsage}} kwargs.setdefault('error_messages', {}).update(min_value=message)
validator_kwarg = [ validator_kwarg = [
validator for validator in validator_kwarg validator for validator in validator_kwarg
if not isinstance(validator, validators.MinValueValidator) if not isinstance(validator, validators.MinValueValidator)

3
tests/test_model_serializer.py
View File

@ -214,6 +214,9 @@ class TestRegularFieldMappings(TestCase):
expected = expected.replace( expected = expected.replace(
"('red', 'Red'), ('blue', 'Blue'), ('green', 'Green')", "('red', 'Red'), ('blue', 'Blue'), ('green', 'Green')",
"(u'red', u'Red'), (u'blue', u'Blue'), (u'green', u'Green')" "(u'red', u'Red'), (u'blue', u'Blue'), (u'green', u'Green')"
).replace(
"{'max_value': 'Ensure this value is less than or equal to %(limit_value)s.', 'min_value': 'Ensure this value is greater than or equal to %(limit_value)s.'}",
{'max_value': u'Ensure this value is less than or equal to %(limit_value)s.', 'min_value': u'Ensure this value is greater than or equal to %(limit_value)s.'}
) )
self.assertEqual(unicode_repr(TestSerializer()), expected) self.assertEqual(unicode_repr(TestSerializer()), expected)