Skip to content
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions rest_framework/permissions.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,9 @@ def has_permission(self, request, view):

def has_object_permission(self, request, view, obj):
return (
self.op1.has_object_permission(request, view, obj) or
self.op2.has_object_permission(request, view, obj)
(self.op1.has_permission(request, view) and self.op1.has_object_permission(request, view, obj))
or
(self.op2.has_permission(request, view) and self.op2.has_object_permission(request, view, obj))
)


Expand Down