From b9da6911e694a50dda8f018426f2833c55e816e8 Mon Sep 17 00:00:00 2001 From: ErikKalkoken Date: Thu, 20 Feb 2020 20:07:48 +0100 Subject: [PATCH] Fix Mumble search issue --- allianceauth/services/admin.py | 7 ++----- allianceauth/services/modules/discord/admin.py | 5 ++--- allianceauth/services/modules/teamspeak3/admin.py | 1 + 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/allianceauth/services/admin.py b/allianceauth/services/admin.py index 061b97e1..7128c218 100644 --- a/allianceauth/services/admin.py +++ b/allianceauth/services/admin.py @@ -20,11 +20,8 @@ class ServicesUserAdmin(admin.ModelAdmin): "all": ("services/admin.css",) } - search_fields = ( - 'user__username', - 'uid' - ) - ordering = ('user__username', ) + search_fields = ('user__username',) + ordering = ('user__username',) list_select_related = True list_display = ( user_profile_pic, diff --git a/allianceauth/services/modules/discord/admin.py b/allianceauth/services/modules/discord/admin.py index c5b12467..55fffd05 100644 --- a/allianceauth/services/modules/discord/admin.py +++ b/allianceauth/services/modules/discord/admin.py @@ -6,9 +6,8 @@ from ...admin import ServicesUserAdmin @admin.register(DiscordUser) class DiscordUserAdmin(ServicesUserAdmin): - list_display = ServicesUserAdmin.list_display + ( - '_uid', - ) + list_display = ServicesUserAdmin.list_display + ('_uid',) + search_fields = ServicesUserAdmin.search_fields + ('uid', ) def _uid(self, obj): return obj.uid diff --git a/allianceauth/services/modules/teamspeak3/admin.py b/allianceauth/services/modules/teamspeak3/admin.py index 0a6379dd..9b562ecc 100644 --- a/allianceauth/services/modules/teamspeak3/admin.py +++ b/allianceauth/services/modules/teamspeak3/admin.py @@ -10,6 +10,7 @@ class Teamspeak3UserAdmin(ServicesUserAdmin): 'uid', 'perm_key' ) + search_fields = ServicesUserAdmin.search_fields + ('uid', ) @admin.register(AuthTS)