diff options
| author | Tom Christie | 2013-06-05 13:33:19 +0100 | 
|---|---|---|
| committer | Tom Christie | 2013-06-05 13:33:19 +0100 | 
| commit | de00ec95c3007dd90b5b01f7486b430699ea63c1 (patch) | |
| tree | d2ce8037d446fd9133b3d6a77ebcc49350d7ebc3 /rest_framework/permissions.py | |
| parent | 9428d6ddb5ebc2d5d9c8557a52be09f0def69cca (diff) | |
| parent | 2ca243a1144bb2a5461767a21ed14dec1d2b8dc2 (diff) | |
| download | django-rest-framework-de00ec95c3007dd90b5b01f7486b430699ea63c1.tar.bz2 | |
Merge master
Diffstat (limited to 'rest_framework/permissions.py')
| -rw-r--r-- | rest_framework/permissions.py | 5 | 
1 files changed, 5 insertions, 0 deletions
diff --git a/rest_framework/permissions.py b/rest_framework/permissions.py index 751f31a7..45fcfd66 100644 --- a/rest_framework/permissions.py +++ b/rest_framework/permissions.py @@ -126,6 +126,11 @@ class DjangoModelPermissions(BasePermission):          if model_cls is None and queryset is not None:              model_cls = queryset.model +        # Workaround to ensure DjangoModelPermissions are not applied +        # to the root view when using DefaultRouter. +        if model_cls is None and getattr(view, '_ignore_model_permissions'): +            return True +          assert model_cls, ('Cannot apply DjangoModelPermissions on a view that'                             ' does not have `.model` or `.queryset` property.')  | 
