mirror of
https://github.com/encode/django-rest-framework.git
synced 2024-11-22 17:47:04 +03:00
Add Serializer.save() to clean up differences between serializer.object being either a DeserializedObject or a model instance
This commit is contained in:
parent
36b58d0c78
commit
7c303411a9
|
@ -20,8 +20,7 @@ class CreateModelMixin(object):
|
|||
def create(self, request, *args, **kwargs):
|
||||
serializer = self.get_serializer(data=request.DATA)
|
||||
if serializer.is_valid():
|
||||
self.object = serializer.object
|
||||
self.object.save()
|
||||
self.object = serializer.save()
|
||||
return Response(serializer.data, status=status.HTTP_201_CREATED)
|
||||
return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
|
||||
|
||||
|
@ -75,8 +74,7 @@ class UpdateModelMixin(object):
|
|||
self.object = self.get_object()
|
||||
serializer = self.get_serializer(data=request.DATA, instance=self.object)
|
||||
if serializer.is_valid():
|
||||
self.object = serializer.object
|
||||
self.object.save()
|
||||
self.object = serializer.save()
|
||||
return Response(serializer.data)
|
||||
return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
|
||||
|
||||
|
|
|
@ -275,6 +275,13 @@ class BaseSerializer(Field):
|
|||
self._data = self.to_native(self.object)
|
||||
return self._data
|
||||
|
||||
def save(self):
|
||||
"""
|
||||
Save the deserialized object and return it.
|
||||
"""
|
||||
self.object.save()
|
||||
return self.object
|
||||
|
||||
|
||||
class Serializer(BaseSerializer):
|
||||
__metaclass__ = SerializerMetaclass
|
||||
|
@ -379,3 +386,10 @@ class ModelSerializer(RelatedField, Serializer):
|
|||
if field.name in attrs:
|
||||
m2m_data[field.name] = attrs.pop(field.name)
|
||||
return DeserializedObject(self.opts.model(**attrs), m2m_data)
|
||||
|
||||
def save(self):
|
||||
"""
|
||||
Save the deserialized object and return it.
|
||||
"""
|
||||
self.object.save()
|
||||
return self.object.object
|
||||
|
|
|
@ -135,10 +135,10 @@ class ManyToManyTests(TestCase):
|
|||
data = {'rel': [self.anchor.id]}
|
||||
serializer = self.serializer_class(data)
|
||||
self.assertEquals(serializer.is_valid(), True)
|
||||
serializer.object.save()
|
||||
obj = serializer.object.object
|
||||
self.assertEquals(obj.pk, 2)
|
||||
self.assertEquals(list(obj.rel.all()), [self.anchor])
|
||||
instance = serializer.save()
|
||||
self.assertEquals(len(ManyToManyModel.objects.all()), 2)
|
||||
self.assertEquals(instance.pk, 2)
|
||||
self.assertEquals(list(instance.rel.all()), [self.anchor])
|
||||
# self.assertFalse(serializer.object is expected)
|
||||
|
||||
# def test_deserialization_for_update(self):
|
||||
|
|
Loading…
Reference in New Issue
Block a user