diff options
| author | Nikolaus Schlemm | 2013-05-19 09:02:07 +0200 |
|---|---|---|
| committer | Nikolaus Schlemm | 2013-05-19 09:02:07 +0200 |
| commit | 9454e23aa927931dcb7a6921c6ad238f6369e64e (patch) | |
| tree | 967fcbf13b3186a187c72ca9645cb24dbf6b425a /rest_framework/serializers.py | |
| parent | 843ae6023753a0373eb2e6398ddda93e4da74de5 (diff) | |
| parent | 7c945b43f05f1b340f78c23f80c8043937c7fd2a (diff) | |
| download | django-rest-framework-9454e23aa927931dcb7a6921c6ad238f6369e64e.tar.bz2 | |
Merge branch 'master' of git://github.com/tomchristie/django-rest-framework into issue-192-expose-fields-for-options
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'], |