Commit 0b864acd by Tom Christie

Merge pull request #1785 from gdoermann/master

Frameworks throws AssertionError saying you cannot set required=True and...
parents 4ce4a7c4 f27a2868
...@@ -845,7 +845,7 @@ class ModelSerializer(Serializer): ...@@ -845,7 +845,7 @@ class ModelSerializer(Serializer):
} }
if model_field: 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: if model_field.help_text is not None:
kwargs['help_text'] = model_field.help_text kwargs['help_text'] = model_field.help_text
if model_field.verbose_name is not None: if model_field.verbose_name is not None:
...@@ -868,7 +868,7 @@ class ModelSerializer(Serializer): ...@@ -868,7 +868,7 @@ class ModelSerializer(Serializer):
""" """
kwargs = {} kwargs = {}
if model_field.null or model_field.blank: if model_field.null or model_field.blank and model_field.editable:
kwargs['required'] = False kwargs['required'] = False
if isinstance(model_field, models.AutoField) or not model_field.editable: if isinstance(model_field, models.AutoField) or not model_field.editable:
...@@ -1126,7 +1126,7 @@ class HyperlinkedModelSerializer(ModelSerializer): ...@@ -1126,7 +1126,7 @@ class HyperlinkedModelSerializer(ModelSerializer):
} }
if model_field: 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: if model_field.help_text is not None:
kwargs['help_text'] = model_field.help_text kwargs['help_text'] = model_field.help_text
if model_field.verbose_name is not None: if model_field.verbose_name is not None:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment