diff options
| author | Marko Tibold | 2012-11-15 22:48:22 +0100 |
|---|---|---|
| committer | Marko Tibold | 2012-11-15 22:48:22 +0100 |
| commit | 403886b79b9bf5790ee6f07d6ca915cff5b3035a (patch) | |
| tree | 987db12d60d8dbf56d8f23ff694d7208df6e3184 /rest_framework/generics.py | |
| parent | 69a01d71256b9923aac1b8d1b91063068ecfebf7 (diff) | |
| parent | 3b258d69c92e9d9293f7c5d1690f0ca434e677e3 (diff) | |
| download | django-rest-framework-403886b79b9bf5790ee6f07d6ca915cff5b3035a.tar.bz2 | |
Merge commit '3b258d69c92e9d9293f7c5d1690f0ca434e677e3' into file_and_image_fields
Diffstat (limited to 'rest_framework/generics.py')
| -rw-r--r-- | rest_framework/generics.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rest_framework/generics.py b/rest_framework/generics.py index d47c39cd..87c2de70 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -91,11 +91,11 @@ class SingleObjectAPIView(SingleObjectMixin, GenericAPIView): pk_url_kwarg = 'pk' # Not provided in Django 1.3 slug_url_kwarg = 'slug' # Not provided in Django 1.3 - def get_object(self): + def get_object(self, queryset=None): """ Override default to add support for object-level permissions. """ - obj = super(SingleObjectAPIView, self).get_object() + obj = super(SingleObjectAPIView, self).get_object(queryset) if not self.has_permission(self.request, obj): self.permission_denied(self.request) return obj |