encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-07-27 08:29:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 1093f026a1 into 3868241f6a

Browse Source
This commit is contained in:
Brandon Konkle 2012-12-06 09:17:55 -08:00
commit c747960bfb
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rest_framework/mixins.py
View File

@ -14,8 +14,10 @@ class CreateModelMixin(object):
Create a model instance. Create a model instance.
Should be mixed in with any `BaseView`. Should be mixed in with any `BaseView`.
""" """
def create(self, request, *args, **kwargs): def create(self, request, data=None, *args, **kwargs):
serializer = self.get_serializer(data=request.DATA, files=request.FILES) if data is None:
data = request.DATA
serializer = self.get_serializer(data=data, files=request.FILES)
if serializer.is_valid(): if serializer.is_valid():
self.pre_save(serializer.object) self.pre_save(serializer.object)
self.object = serializer.save() self.object = serializer.save()
@ -81,7 +83,7 @@ class UpdateModelMixin(object):
Update a model instance. Update a model instance.
Should be mixed in with `SingleObjectBaseView`. Should be mixed in with `SingleObjectBaseView`.
""" """
def update(self, request, *args, **kwargs): def update(self, request, data=None, *args, **kwargs):
try: try:
self.object = self.get_object() self.object = self.get_object()
created = False created = False
@ -89,7 +91,10 @@ class UpdateModelMixin(object):
self.object = None self.object = None
created = True created = True
serializer = self.get_serializer(self.object, data=request.DATA, files=request.FILES) if data is None:
data = request.DATA
serializer = self.get_serializer(self.object, data=data, files=request.FILES)
if serializer.is_valid(): if serializer.is_valid():
self.pre_save(serializer.object) self.pre_save(serializer.object)