Hopiu/django-authority
1
0
Fork 0
mirror of https://github.com/jazzband/django-authority.git synced 2026-05-10 08:34:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refs #7: doing the correct number of queries now

Browse source
This commit is contained in:
Jason Ward 2012-09-26 16:01:01 -04:00
parent 2d71ba46b1
commit 7c899a245d
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
authority/permissions.py
View file

@ -50,8 +50,6 @@ class BasePermission(object):
return {}, {}
perms = Permission.objects.filter(
Q(user__pk=self.user.pk) | Q(group__in=self.user.groups.all()),
).select_related(
'group',
)
user_permissions = {}
group_permissions = {}
@ -63,7 +61,10 @@ class BasePermission(object):
perm.codename,
perm.approved,
)] = True
if perm.group and self.user in perm.group.user_set.all():
# If the user has the permission do for something, but perm.user !=
# self.user then by definition that permission came from the
# group.
else:
group_permissions[(
perm.object_id,
perm.content_type_id,
@ -162,11 +163,13 @@ class BasePermission(object):
return False
if self.use_smart_cache:
content_type_pk = Permission.objects.get_content_type(obj).pk
def _user_has_perms(cached_perms):
# Check to see if the permission is in the cache.
return cached_perms.get((
obj.pk,
Permission.objects.get_content_type(obj).pk,
content_type_pk,
perm,
approved,
))