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

Improve admin site

Browse Source
This commit is contained in:
ErikKalkoken
2020-02-06 18:51:52 +01:00
parent 458685026b
commit 2d24d064d5
4 changed files with 134 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
allianceauth/authentication/admin.py
View File

@@ -122,10 +122,9 @@ class MainCorporationsFilter(admin.SimpleListFilter):
parameter_name = 'main_corporations'
def lookups(self, request, model_admin):
qs = UserProfile.objects\
.exclude(main_character=None)\
.values(corporation_id=F('main_character__corporation_id'))\
.annotate(corporation_name=F('main_character__corporation_name'))\
qs = EveCharacter.objects\
.exclude(userprofile=None)\
.values('corporation_id', 'corporation_name')\
.distinct()
return tuple([
(x['corporation_id'], x['corporation_name']) for x in qs
@@ -145,11 +144,10 @@ class MainAllianceFilter(admin.SimpleListFilter):
parameter_name = 'main_alliances'
def lookups(self, request, model_admin):
qs = UserProfile.objects\
.exclude(main_character=None)\
.exclude(main_character__alliance_id=None)\
.values(alliance_id=F('main_character__alliance_id'))\
.annotate(alliance_name=F('main_character__alliance_name'))\
qs = EveCharacter.objects\
.exclude(alliance_id=None)\
.exclude(userprofile=None)\
.values('alliance_id', 'alliance_name')\
.distinct()
return tuple([
(x['alliance_id'], x['alliance_name']) for x in qs