diff options
| author | Tom Christie | 2015-01-05 10:52:18 +0000 | 
|---|---|---|
| committer | Tom Christie | 2015-01-05 10:52:18 +0000 | 
| commit | 8cf37449715c32c4a692667814466c7f32e8734f (patch) | |
| tree | f52931518b200be60a0aa06014af5254ba678655 | |
| parent | f8e310fdbb93f16f7da31c6867abf0001837d7e3 (diff) | |
| download | django-rest-framework-8cf37449715c32c4a692667814466c7f32e8734f.tar.bz2 | |
Ensure no invalid min_length/min_value/max_value arguments. Closes #2369.
| -rw-r--r-- | rest_framework/utils/field_mapping.py | 11 | 
1 files changed, 8 insertions, 3 deletions
| diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py index b2f4dd80..cba40d31 100644 --- a/rest_framework/utils/field_mapping.py +++ b/rest_framework/utils/field_mapping.py @@ -10,6 +10,11 @@ from rest_framework.validators import UniqueValidator  import inspect +NUMERIC_FIELD_TYPES = ( +    models.IntegerField, models.FloatField, models.DecimalField +) + +  class ClassLookupDict(object):      """      Takes a dictionary with classes as keys. @@ -119,7 +124,7 @@ def get_field_kwargs(field_name, model_field):          validator.limit_value for validator in validator_kwarg          if isinstance(validator, validators.MinLengthValidator)      ), None) -    if min_length is not None: +    if min_length is not None and isinstance(model_field, models.CharField):          kwargs['min_length'] = min_length          validator_kwarg = [              validator for validator in validator_kwarg @@ -132,7 +137,7 @@ def get_field_kwargs(field_name, model_field):          validator.limit_value for validator in validator_kwarg          if isinstance(validator, validators.MaxValueValidator)      ), None) -    if max_value is not None: +    if max_value is not None and isinstance(model_field, NUMERIC_FIELD_TYPES):          kwargs['max_value'] = max_value          validator_kwarg = [              validator for validator in validator_kwarg @@ -145,7 +150,7 @@ def get_field_kwargs(field_name, model_field):          validator.limit_value for validator in validator_kwarg          if isinstance(validator, validators.MinValueValidator)      ), None) -    if min_value is not None: +    if min_value is not None and isinstance(model_field, NUMERIC_FIELD_TYPES):          kwargs['min_value'] = min_value          validator_kwarg = [              validator for validator in validator_kwarg | 
