diff options
| author | Tom Christie | 2011-07-19 12:46:19 -0700 |
|---|---|---|
| committer | Tom Christie | 2011-07-19 12:46:19 -0700 |
| commit | d03bdba54ca7506360712952380c7980e1f27d3f (patch) | |
| tree | 433586474b063efd2db4708100e239a45c861ca9 /djangorestframework/resources.py | |
| parent | e956d5177e032611d79ea46e6b629713bf90d2c0 (diff) | |
| parent | 88fa45edc2bb67a546e84eca13ec2c92f8d460c7 (diff) | |
| download | django-rest-framework-d03bdba54ca7506360712952380c7980e1f27d3f.tar.bz2 | |
Merge pull request #53 from ulmus/master
ModelResource __init__ doesn't handle depth and stack arguments
Diffstat (limited to 'djangorestframework/resources.py')
| -rw-r--r-- | djangorestframework/resources.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/djangorestframework/resources.py b/djangorestframework/resources.py index be361ab8..f4a2ab14 100644 --- a/djangorestframework/resources.py +++ b/djangorestframework/resources.py @@ -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 |
