Skip to content

Commit c8a8f68

Browse files
committed
removed duplicated code from django-cms#2875
1 parent 5fbeacb commit c8a8f68

File tree

1 file changed

+2
-13
lines changed

1 file changed

+2
-13
lines changed

cms/models/placeholdermodel.py

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -107,21 +107,10 @@ def _get_permission(self, request, key):
107107
return self._get_object_permission(obj, request, key)
108108

109109
def _get_object_permission(self, obj, request, key):
110-
found = False
111-
model = obj.__class__
112-
opts = model._meta
110+
opts = obj._meta
113111
perm_accessor = getattr(opts, 'get_%s_permission' % key)
114112
perm_code = '%s.%s' % (opts.app_label, perm_accessor())
115-
# if they don't have the permission for this attached model or object, bail out
116-
if not (request.user.has_perm(perm_code) or request.user.has_perm(perm_code, obj)):
117-
return False
118-
else:
119-
found = True
120-
if not (request.user.has_perm(perm_code) or request.user.has_perm(perm_code, obj)):
121-
return False
122-
else:
123-
found = True
124-
return found
113+
return request.user.has_perm(perm_code) or request.user.has_perm(perm_code, obj)
125114

126115
def has_change_permission(self, request):
127116
return self._get_permission(request, 'change')

0 commit comments

Comments
 (0)