Add fields to discord and ts3 admin

allianceauth/services/modules/discord/admin.py

@@ -3,7 +3,55 @@ from .models import DiscordUser
 
 
 class DiscordUserAdmin(admin.ModelAdmin):
-        list_display = ('user', 'uid')
-        search_fields = ('user__username', 'uid')
+    ordering = ('user__username', )
+    list_select_related = True  
+    
+    list_display = (
+        'user', 
+        'uid',
+        '_corporation',
+        '_alliance',
+        '_date_joined'
+    )
+    search_fields = (
+        'user__username', 
+        'uid'
+    )
+    list_filter = (
+        'user__profile__main_character__corporation_name',
+        'user__profile__main_character__alliance_name',
+        'user__date_joined',
+    )
+
+    def _corporation(self, obj):
+        if obj.user.profile.main_character:
+            return obj.user.profile.main_character.corporation_name
+        else:
+            return ''
+    
+    _corporation.short_description = 'corporation (main)'
+    _corporation.admin_order_field \
+        = 'user__profile__main_character__corporation_name'
+
+
+    def _alliance(self, obj):        
+        if (obj.user.profile.main_character 
+            and obj.user.profile.main_character.alliance_id
+        ):
+            return obj.user.profile.main_character.alliance_name
+        else:
+            return ''
+    
+    _alliance.short_description = 'alliance (main)'
+    _alliance.admin_order_field \
+        = 'user__profile__main_character__alliance_name'
+
+
+    def _date_joined(self, obj):
+        return obj.user.date_joined
+    
+    _date_joined.short_description = 'date joined'
+    _date_joined.admin_order_field = 'user__date_joined'
+
 
 admin.site.register(DiscordUser, DiscordUserAdmin)

allianceauth/services/modules/teamspeak3/admin.py

@@ -2,9 +2,58 @@ from django.contrib import admin
 from .models import AuthTS, Teamspeak3User, StateGroup
 
 
-class Teamspeak3UserAdmin(admin.ModelAdmin):
-        list_display = ('user', 'uid', 'perm_key')
-        search_fields = ('user__username', 'uid', 'perm_key')
+class Teamspeak3UserAdmin(admin.ModelAdmin):    
+    ordering = ('user__username', )
+    list_select_related = True  
+    
+    list_display = (
+        'user', 
+        'uid',        
+        '_corporation',
+        '_alliance',        
+        '_date_joined',
+        'perm_key',
+    )
+    search_fields = (
+        'user__username', 
+        'uid',
+        'perm_key'
+    )
+    list_filter = (
+        'user__profile__main_character__corporation_name',
+        'user__profile__main_character__alliance_name',
+        'user__date_joined',
+    )
+
+    def _corporation(self, obj):
+        if obj.user.profile.main_character:
+            return obj.user.profile.main_character.corporation_name
+        else:
+            return ''
+    
+    _corporation.short_description = 'corporation (main)'
+    _corporation.admin_order_field \
+        = 'user__profile__main_character__corporation_name'
+
+
+    def _alliance(self, obj):        
+        if (obj.user.profile.main_character 
+            and obj.user.profile.main_character.alliance_id
+        ):
+            return obj.user.profile.main_character.alliance_name
+        else:
+            return ''
+    
+    _alliance.short_description = 'alliance (main)'
+    _alliance.admin_order_field \
+        = 'user__profile__main_character__alliance_name'
+
+
+    def _date_joined(self, obj):
+        return obj.user.date_joined
+    
+    _date_joined.short_description = 'date joined'
+    _date_joined.admin_order_field = 'user__date_joined'
 
 
 class AuthTSgroupAdmin(admin.ModelAdmin):