diff options
| author | Tom Christie | 2013-02-07 09:24:34 +0000 | 
|---|---|---|
| committer | Tom Christie | 2013-02-07 09:24:34 +0000 | 
| commit | 8113d661260834a91d91481f31860398cde9212d (patch) | |
| tree | a83fd3675b820f576c5c30370b800bab6f2356c6 /rest_framework | |
| parent | 5813a0951221f68591ade2039964531e754ca262 (diff) | |
| download | django-rest-framework-8113d661260834a91d91481f31860398cde9212d.tar.bz2 | |
Use new style of `required=<bool>` not `blank` or `null`
Diffstat (limited to 'rest_framework')
| -rw-r--r-- | rest_framework/serializers.py | 8 | ||||
| -rw-r--r-- | rest_framework/tests/relations_slug.py | 2 | ||||
| -rw-r--r-- | rest_framework/tests/serializer.py | 2 | 
3 files changed, 5 insertions, 7 deletions
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 6d7c5345..7daeac41 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -481,17 +481,15 @@ class ModelSerializer(Serializer):          Creates a default instance of a basic non-relational field.          """          kwargs = {} +        has_default = model_field.has_default() -        kwargs['blank'] = model_field.blank - -        if model_field.null or model_field.blank: +        if model_field.null or model_field.blank or has_default:              kwargs['required'] = False          if isinstance(model_field, models.AutoField) or not model_field.editable:              kwargs['read_only'] = True -        if model_field.has_default(): -            kwargs['required'] = False +        if has_default:              kwargs['default'] = model_field.get_default()          if issubclass(model_field.__class__, models.TextField): diff --git a/rest_framework/tests/relations_slug.py b/rest_framework/tests/relations_slug.py index ef829210..a325f6ea 100644 --- a/rest_framework/tests/relations_slug.py +++ b/rest_framework/tests/relations_slug.py @@ -18,7 +18,7 @@ class ForeignKeySourceSerializer(serializers.ModelSerializer):  class NullableForeignKeySourceSerializer(serializers.ModelSerializer): -    target = serializers.SlugRelatedField(slug_field='name', null=True) +    target = serializers.SlugRelatedField(slug_field='name', required=False)      class Meta:          model = NullableForeignKeySource diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py index 57429e2e..62de16ab 100644 --- a/rest_framework/tests/serializer.py +++ b/rest_framework/tests/serializer.py @@ -802,7 +802,7 @@ class BlankFieldTests(TestCase):                  model = BlankFieldModel          class BlankFieldSerializer(serializers.Serializer): -            title = serializers.CharField(blank=True) +            title = serializers.CharField(required=False)          class NotBlankFieldModelSerializer(serializers.ModelSerializer):              class Meta:  | 
