diff options
| author | Tom Christie | 2013-05-18 17:22:27 +0100 |
|---|---|---|
| committer | Tom Christie | 2013-05-18 17:22:27 +0100 |
| commit | bac4bf6e95d6cc6828115bd0a79cd524a6abd163 (patch) | |
| tree | 431794e91dec87c099ffb3dcce8a50c4ce0507e7 /rest_framework/serializers.py | |
| parent | 0d3d66cb0232e1067600ef22fcf88937ac6bee9d (diff) | |
| parent | 6af61a19b78b0ebb9d8403e96c6e4a77c675b141 (diff) | |
| download | django-rest-framework-bac4bf6e95d6cc6828115bd0a79cd524a6abd163.tar.bz2 | |
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
Diffstat (limited to 'rest_framework/serializers.py')
| -rw-r--r-- | rest_framework/serializers.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index ff5eb873..943fba6b 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -744,6 +744,11 @@ class ModelSerializer(Serializer): kwargs['choices'] = model_field.flatchoices return ChoiceField(**kwargs) + # put this below the ChoiceField because min_value isn't a valid initializer + if issubclass(model_field.__class__, models.PositiveIntegerField) or\ + issubclass(model_field.__class__, models.PositiveSmallIntegerField): + kwargs['min_value'] = 0 + attribute_dict = { models.CharField: ['max_length'], models.CommaSeparatedIntegerField: ['max_length'], |