mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2026-02-12 18:16:24 +01:00
BS5 Theme
This commit is contained in:
@@ -87,7 +87,7 @@ def group_membership_audit(request, group_id):
|
||||
|
||||
except ObjectDoesNotExist:
|
||||
raise Http404("Group does not exist")
|
||||
render_items = {'group': group.name}
|
||||
render_items = {'group': group}
|
||||
entries = RequestLog.objects.filter(group=group).order_by('-date')
|
||||
render_items['entries'] = entries
|
||||
|
||||
@@ -311,8 +311,10 @@ def groups_view(request):
|
||||
groups_qs = GroupManager.get_joinable_groups_for_user(
|
||||
request.user, include_hidden=False
|
||||
)
|
||||
groups_qs = groups_qs.order_by('name')
|
||||
groups_qs = groups_qs.order_by('name').select_related("authgroup").prefetch_related('authgroup__group_leaders', 'authgroup__group_leaders__profile__main_character', 'authgroup__group_leader_groups')
|
||||
groups = []
|
||||
|
||||
## TODO see about making this faster
|
||||
for group in groups_qs:
|
||||
group_request = GroupRequest.objects\
|
||||
.filter(user=request.user)\
|
||||
@@ -322,7 +324,14 @@ def groups_view(request):
|
||||
'request': group_request[0] if group_request else None
|
||||
})
|
||||
|
||||
context = {'groups': groups}
|
||||
count = 0
|
||||
perms = GroupManager.can_manage_groups(request.user)
|
||||
if perms:
|
||||
count = GroupManager.pending_requests_count_for_user(request.user)
|
||||
|
||||
user_groups_list = list(request.user.groups.all())
|
||||
context = {'groups': groups, "manager_perms": perms, "req_count":count, "user_groups": user_groups_list}
|
||||
|
||||
return render(request, 'groupmanagement/groups.html', context=context)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user