encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-07-23 14:40:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge eb11dd5803 into 0fc5a49a11

Browse Source
This commit is contained in:
Camille Harang 2012-09-09 11:08:58 -07:00
commit 5214e97529
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
djangorestframework/resources.py
View File

@ -309,14 +309,11 @@ class ModelResource(FormResource):
return None
# Instantiate the ModelForm as appropriate
if data is not None or files is not None:
if issubclass(form, forms.ModelForm) and hasattr(self.view, 'model_instance'):
# Bound to an existing model instance
return form(data, files, instance=self.view.model_instance)
else:
return form(data, files)
form_kwargs = {'data': data, 'files': files}
# Bound to an existing model instance
if issubclass(form, forms.ModelForm) and hasattr(self.view, 'model_instance'): form_kwargs['instance'] = self.view.model_instance
return form()
return form(**form_kwargs)
@property
def _model_fields_set(self):