diff options
| author | Emanuele Pucciarelli | 2014-03-28 19:42:46 +0100 | 
|---|---|---|
| committer | Emanuele Pucciarelli | 2014-03-28 19:42:46 +0100 | 
| commit | ab5082d15c04866401c6f1bc7d77d21e695f996d (patch) | |
| tree | e510f5bf99bf4f2349b9eeec0899e51e0c48fa9f /rest_framework/serializers.py | |
| parent | 04315c12af09d9b2ee1106ab31af5891833dd2f9 (diff) | |
| download | django-rest-framework-ab5082d15c04866401c6f1bc7d77d21e695f996d.tar.bz2 | |
Do not check model_field's attributes if it is None
Diffstat (limited to 'rest_framework/serializers.py')
| -rw-r--r-- | rest_framework/serializers.py | 12 | 
1 files changed, 6 insertions, 6 deletions
| diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 46beb6ac..d7941df1 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -828,14 +828,14 @@ class ModelSerializer(Serializer):          if model_field:              kwargs['required'] = not(model_field.null or model_field.blank) -        if not model_field.editable: -            kwargs['read_only'] = True +            if not model_field.editable: +                kwargs['read_only'] = True -        if model_field.verbose_name is not None: -            kwargs['label'] = model_field.verbose_name +            if model_field.verbose_name is not None: +                kwargs['label'] = model_field.verbose_name -        if model_field.help_text is not None: -            kwargs['help_text'] = model_field.help_text +            if model_field.help_text is not None: +                kwargs['help_text'] = model_field.help_text          return PrimaryKeyRelatedField(**kwargs) | 
