diff options
| author | Tom Christie | 2014-10-31 15:29:06 +0000 |
|---|---|---|
| committer | Tom Christie | 2014-10-31 15:29:06 +0000 |
| commit | 0b864acd98e92425ebc148c9867b9ef0ea18a824 (patch) | |
| tree | ffa97011ee59366a2f028f2f3fc0597d25fd1062 | |
| parent | 4ce4a7c41a3e7b22dfb0aaeeea1c195e7db32447 (diff) | |
| parent | f27a28682bdb1b4eea0ec9afca2eb2835c735f55 (diff) | |
| download | django-rest-framework-0b864acd98e92425ebc148c9867b9ef0ea18a824.tar.bz2 | |
Merge pull request #1785 from gdoermann/master
Frameworks throws AssertionError saying you cannot set required=True and...
| -rw-r--r-- | rest_framework/serializers.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index b3db3582..d24cb99d 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -845,7 +845,7 @@ class ModelSerializer(Serializer): } if model_field: - kwargs['required'] = not(model_field.null or model_field.blank) + kwargs['required'] = not(model_field.null or model_field.blank) and model_field.editable if model_field.help_text is not None: kwargs['help_text'] = model_field.help_text if model_field.verbose_name is not None: @@ -868,7 +868,7 @@ class ModelSerializer(Serializer): """ kwargs = {} - if model_field.null or model_field.blank: + if model_field.null or model_field.blank and model_field.editable: kwargs['required'] = False if isinstance(model_field, models.AutoField) or not model_field.editable: @@ -1126,7 +1126,7 @@ class HyperlinkedModelSerializer(ModelSerializer): } if model_field: - kwargs['required'] = not(model_field.null or model_field.blank) + kwargs['required'] = not(model_field.null or model_field.blank) and model_field.editable if model_field.help_text is not None: kwargs['help_text'] = model_field.help_text if model_field.verbose_name is not None: |