encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-07-23 06:29:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge ba735e6d27 into 9a741e7ddb

Browse Source
This commit is contained in:
Marko Tibold 2012-10-24 10:33:04 -07:00
commit 1f0eb865a3
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rest_framework/serializers.py
View File

@ -420,10 +420,14 @@ class ModelSerializer(Serializer):
models.CommaSeparatedIntegerField: CharField,
models.BooleanField: BooleanField,
}
try:
ret = field_mapping[model_field.__class__]()
except KeyError:
ret = ModelField(model_field=model_field)
if model_field.flatchoices: # This ModelField contains choices
ret = ChoiceField(model_field.flatchoices)
else:
try:
ret = field_mapping[model_field.__class__]()
except KeyError:
ret = ModelField(model_field=model_field)
if model_field.default is not None:
ret.required = False