encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-04-22 18:12:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 88fa45edc2 into e956d5177e

Browse Source
This commit is contained in:
GitHub Merge Button 2011-07-19 12:46:08 -07:00
commit 55ed04199b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
djangorestframework/resources.py
View File

@ -279,13 +279,13 @@ class ModelResource(FormResource):
include = ('url',)
def __init__(self, view):
def __init__(self, view=None, depth=None, stack=[], **kwargs):
"""
Allow :attr:`form` and :attr:`model` attributes set on the
:class:`View` to override the :attr:`form` and :attr:`model`
attributes set on the :class:`Resource`.
"""
super(ModelResource, self).__init__(view)
super(ModelResource, self).__init__(view, depth, stack, **kwargs)
self.model = getattr(view, 'model', None) or self.model