Cleaned up files, removed ununsed imports
This commit is contained in:
@@ -26,10 +26,10 @@ class Permission(models.Model):
|
||||
|
||||
def __unicode__(self):
|
||||
return self.label
|
||||
|
||||
|
||||
def get_holders(self):
|
||||
return [holder.holder_object for holder in self.permissionholder_set.all()]
|
||||
|
||||
|
||||
def has_permission(self, requester):
|
||||
if isinstance(requester, User):
|
||||
if requester.is_superuser or requester.is_staff:
|
||||
@@ -38,8 +38,8 @@ class Permission(models.Model):
|
||||
# Request is one of the permission's holders?
|
||||
if requester in self.get_holders():
|
||||
return True
|
||||
|
||||
# If not check if the requesters memberships objects is one of
|
||||
|
||||
# If not check if the requesters memberships objects is one of
|
||||
# the permission's holder?
|
||||
roles = RoleMember.objects.get_roles_for_member(requester)
|
||||
|
||||
@@ -47,7 +47,7 @@ class Permission(models.Model):
|
||||
groups = requester.groups.all()
|
||||
else:
|
||||
groups = []
|
||||
|
||||
|
||||
for membership in list(set(roles) | set(groups)):
|
||||
if self.has_permission(membership):
|
||||
return True
|
||||
|
||||
Reference in New Issue
Block a user