From f37500b0b4dcd58d1eaae3b8bc54daeeedef3cdb Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sat, 21 Jan 2012 04:06:48 -0400 Subject: [PATCH] Allow returning on the db stored permissions --- apps/acls/managers.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/acls/managers.py b/apps/acls/managers.py index e46082e2e9..1fe21cf231 100644 --- a/apps/acls/managers.py +++ b/apps/acls/managers.py @@ -61,14 +61,14 @@ class AccessEntryManager(models.Manager): access_entry.delete() return True - def has_access(self, permission, actor, obj): + def has_access(self, permission, actor, obj, db_only=False): """ Returns whether an actor has a specific permission for an object """ obj = get_source_object(obj) actor = get_source_object(actor) - if isinstance(actor, User): + if isinstance(actor, User) and db_only == False: if actor.is_superuser or actor.is_staff: return True @@ -144,7 +144,7 @@ class AccessEntryManager(models.Manager): return holder_list - def get_holder_permissions_for(self, obj, actor): + def get_holder_permissions_for(self, obj, actor, db_only=False): """ Returns a list of actors that hold at least one permission for a specific object @@ -152,7 +152,7 @@ class AccessEntryManager(models.Manager): logger.debug('obj: %s' % obj) logger.debug('actor: %s' % actor) - if isinstance(actor, User): + if isinstance(actor, User) and db_only == False: if actor.is_superuser or actor.is_staff: return Permission.objects.all()