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

Merge bf9da13d9e into add1260be4

Browse Source
This commit is contained in:
kosz85 2014-05-29 07:28:01 +00:00
commit d5528cafc6
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rest_framework/serializers.py
View File

@ -624,6 +624,7 @@ class ModelSerializerOptions(SerializerOptions):
self.model = getattr(meta, 'model', None)
self.read_only_fields = getattr(meta, 'read_only_fields', ())
self.write_only_fields = getattr(meta, 'write_only_fields', ())
self.error_messages = getattr(meta, 'error_messages', {})
class ModelSerializer(Serializer):
@ -843,6 +844,9 @@ class ModelSerializer(Serializer):
if model_field.help_text is not None:
kwargs['help_text'] = model_field.help_text
if model_field.name in self.opts.error_messages:
kwargs['error_messages'] = self.opts.error_messages[model_field.name]
return PrimaryKeyRelatedField(**kwargs)
def get_field(self, model_field):
@ -869,6 +873,9 @@ class ModelSerializer(Serializer):
if model_field.help_text is not None:
kwargs['help_text'] = model_field.help_text
if model_field.name in self.opts.error_messages:
kwargs['error_messages'] = self.opts.error_messages[model_field.name]
# TODO: TypedChoiceField?
if model_field.flatchoices: # This ModelField contains choices
kwargs['choices'] = model_field.flatchoices