Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2026-02-10 00:56:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

N+1 query fixes

Browse Source
This commit is contained in:
Basraah
2017-10-01 20:55:15 +10:00
parent f33f796421
commit 01d34b54eb
9 changed files with 92 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
allianceauth/permissions_tool/views.py
View File

@@ -3,9 +3,8 @@ import logging
from django.contrib.auth.decorators import login_required, permission_required
from django.contrib.auth.models import Permission, User
from django.db.models import Count
from django.shortcuts import render, get_object_or_404
from django.shortcuts import render, Http404
from allianceauth.authentication.models import UserProfile
logger = logging.getLogger(__name__)
@@ -14,25 +13,28 @@ logger = logging.getLogger(__name__)
@permission_required('permissions_tool.audit_permissions')
def permissions_overview(request):
logger.debug("permissions_overview called by user %s" % request.user)
perms = Permission.objects.all()
perms = Permission.objects.select_related('content_type').all()\
.annotate(Count('user', distinct=True))\
.annotate(Count('group', distinct=True)) \
.annotate(Count('group__user', distinct=True)) \
.annotate(Count('state', distinct=True))\
.annotate(Count('state__userprofile', distinct=True))
get_all = True if request.GET.get('all', 'no') == 'yes' else False
context = {'permissions': []}
for perm in perms:
this_perm = {
'users': perm.user_set.all().count(),
'groups': perm.group_set.all().count(),
'states': perm.state_set.all().count(),
'permission': perm
'users': perm.user__count,
'groups': perm.group__count,
'group_users': perm.group__user__count,
'states': perm.state__count,
'state_users': perm.state__userprofile__count,
'permission': perm,
}
if get_all or this_perm['users'] > 0 or this_perm['groups'] > 0 or this_perm['states'] > 0:
if get_all or sum([this_perm['users'], this_perm['groups'], this_perm['states']]) > 0:
# Only add if we're getting everything or one of the objects has this permission
# Add group_users separately to improve performance
this_perm['group_users'] = sum(group.user_count for group in
perm.group_set.annotate(user_count=Count('user')))
this_perm['state_users'] = UserProfile.objects.filter(state__in=perm.state_set.all()).count()
context['permissions'].append(this_perm)
return render(request, 'permissions_tool/overview.html', context=context)
@@ -42,10 +44,13 @@ def permissions_overview(request):
@permission_required('permissions_tool.audit_permissions')
def permissions_audit(request, app_label, model, codename):
logger.debug("permissions_audit called by user {} on {}:{}:{}".format(request.user, app_label, model, codename))
perm = get_object_or_404(Permission,
content_type__app_label=app_label,
content_type__model=model,
codename=codename)
try:
perm = Permission.objects\
.prefetch_related('group_set', 'user_set', 'state_set',
'state_set__userprofile_set', 'group_set__user_set', 'state_set__userprofile_set__user')\
.get(content_type__app_label=app_label, content_type__model=model, codename=codename)
except Permission.DoesNotExist:
raise Http404
context = {'permission': {
'permission': perm,
@@ -53,7 +58,7 @@ def permissions_audit(request, app_label, model, codename):
'groups': perm.group_set.all(),
'states': perm.state_set.all(),
'group_users': [group.user_set.all() for group in perm.group_set.all()],
'state_users': User.objects.filter(profile__state__in=perm.state_set.all()),
'state_users': [state.userprofile_set.all() for state in perm.state_set.all()],
}
}