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

Merge branch 'master' of https://gitlab.com/allianceauth/allianceauth into v2.9.x

Browse Source
This commit is contained in:
Ariel Rin
2021-06-23 09:58:25 +10:00
parent a0a497ab33 5fcb56a087
commit ae7cfbff35
14 changed files with 113 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
allianceauth/groupmanagement/admin.py
View File

@@ -1,4 +1,5 @@
from django.apps import apps
from django.contrib.auth.models import Permission
from django.contrib import admin
from django.contrib.auth.models import Group as BaseGroup, User
from django.db.models import Count
@@ -122,7 +123,7 @@ class GroupAdmin(admin.ModelAdmin):
qs = super().get_queryset(request)
if _has_auto_groups:
qs = qs.prefetch_related('managedalliancegroup_set', 'managedcorpgroup_set')
qs = qs.prefetch_related('authgroup__group_leaders')
qs = qs.prefetch_related('authgroup__group_leaders').select_related('authgroup')
qs = qs.annotate(
member_count=Count('user', distinct=True),
)
@@ -168,6 +169,11 @@ class GroupAdmin(admin.ModelAdmin):
filter_horizontal = ('permissions',)
inlines = (AuthGroupInlineAdmin,)
def formfield_for_manytomany(self, db_field, request, **kwargs):
if db_field.name == "permissions":
kwargs["queryset"] = Permission.objects.select_related("content_type").all()
return super().formfield_for_manytomany(db_field, request, **kwargs)
class Group(BaseGroup):
class Meta: