Adopt all services user and auth user lists to new format

allianceauth/services/admin.py

@@ -1,6 +1,7 @@
 from django import forms
 from django.contrib import admin
 from django.db.models.functions import Lower
+from django.urls import reverse
 from django.utils.html import format_html
 
 from allianceauth import hooks
@@ -97,10 +98,12 @@ class ServicesUserAdmin(admin.ModelAdmin):
 
 
     def _user(self, obj):
-        link = '/admin/{}/{}/{}/change/'.format(            
-            __package__.rsplit('.', 1)[-1],
-            type(obj).__name__.lower(),
-            obj.pk
+        link = reverse(
+            'admin:{}_{}_change'.format(
+                obj._meta.app_label,
+                type(obj).__name__.lower()
+            ), 
+            args=(obj.pk,)
         )
         return format_html(
             '<strong><a href="{}">{}</a></strong><br>{}',

allianceauth/services/modules/discord/admin.py

@@ -4,6 +4,7 @@ from .models import DiscordUser
 from ...admin import ServicesUserAdmin
 
 
+@admin.register(DiscordUser)
 class DiscordUserAdmin(ServicesUserAdmin):            
     list_display = ServicesUserAdmin.list_display + (        
         '_uid',        
@@ -15,5 +16,3 @@ class DiscordUserAdmin(ServicesUserAdmin):
     _uid.short_description = 'Discord ID (UID)'
     _uid.admin_order_field = 'uid'
 
-
-admin.site.register(DiscordUser, DiscordUserAdmin)

allianceauth/services/modules/discourse/admin.py

@@ -1,9 +1,11 @@
 from django.contrib import admin
+
 from .models import DiscourseUser
+from ...admin import ServicesUserAdmin
 
 
-class DiscourseUserAdmin(admin.ModelAdmin):
-        list_display = ('user',)
-        search_fields = ('user__username',)
-
-admin.site.register(DiscourseUser, DiscourseUserAdmin)
+@admin.register(DiscourseUser)
+class DiscourseUserAdmin(ServicesUserAdmin):
+    list_display = ServicesUserAdmin.list_display + (        
+        'enabled',        
+    ) 

allianceauth/services/modules/mumble/admin.py

@@ -4,6 +4,7 @@ from .models import MumbleUser
 from ...admin import ServicesUserAdmin
 
 
+@admin.register(MumbleUser)
 class MumbleUserAdmin(ServicesUserAdmin):            
     list_display = ServicesUserAdmin.list_display + (        
         'username',        
@@ -15,6 +16,3 @@ class MumbleUserAdmin(ServicesUserAdmin):
     )
 
     fields = ('user', 'username', 'groups')  # pwhash is hidden from admin panel
-
-
-admin.site.register(MumbleUser, MumbleUserAdmin)

allianceauth/services/modules/openfire/admin.py

@@ -1,9 +1,11 @@
 from django.contrib import admin
+
 from .models import OpenfireUser
+from ...admin import ServicesUserAdmin
 
 
-class OpenfireUserAdmin(admin.ModelAdmin):
-        list_display = ('user', 'username')
-        search_fields = ('user__username', 'username')
+@admin.register(OpenfireUser)
+class OpenfireUserAdmin(ServicesUserAdmin):
+    list_display = ServicesUserAdmin.list_display + ('username',)         
+    search_fields = ServicesUserAdmin.search_fields + ('username', )
 
-admin.site.register(OpenfireUser, OpenfireUserAdmin)

allianceauth/services/modules/phpbb3/admin.py

@@ -1,9 +1,9 @@
 from django.contrib import admin
 from .models import Phpbb3User
+from ...admin import ServicesUserAdmin
 
 
-class Phpbb3UserAdmin(admin.ModelAdmin):
-        list_display = ('user', 'username')
-        search_fields = ('user__username', 'username')
-
-admin.site.register(Phpbb3User, Phpbb3UserAdmin)
+@admin.register(Phpbb3User)
+class Phpbb3UserAdmin(ServicesUserAdmin):
+    list_display = ServicesUserAdmin.list_display + ('username',)         
+    search_fields = ServicesUserAdmin.search_fields + ('username', )

allianceauth/services/modules/smf/admin.py

@@ -1,9 +1,10 @@
 from django.contrib import admin
+
 from .models import SmfUser
+from ...admin import ServicesUserAdmin
 
 
-class SmfUserAdmin(admin.ModelAdmin):
-        list_display = ('user', 'username')
-        search_fields = ('user__username', 'username')
-
-admin.site.register(SmfUser, SmfUserAdmin)
+@admin.register(SmfUser)
+class SmfUserAdmin(ServicesUserAdmin):
+    list_display = ServicesUserAdmin.list_display + ('username',)         
+    search_fields = ServicesUserAdmin.search_fields + ('username', )

allianceauth/services/modules/teamspeak3/admin.py

@@ -4,6 +4,7 @@ from .models import AuthTS, Teamspeak3User, StateGroup
 from ...admin import ServicesUserAdmin
 
 
+@admin.register(Teamspeak3User)
 class Teamspeak3UserAdmin(ServicesUserAdmin):    
     list_display = ServicesUserAdmin.list_display + (        
         'uid',
@@ -11,6 +12,7 @@ class Teamspeak3UserAdmin(ServicesUserAdmin):
     )
     
 
+@admin.register(AuthTS)
 class AuthTSgroupAdmin(admin.ModelAdmin):
     ordering = ('auth_group__name', )
     list_select_related = True  
@@ -32,7 +34,3 @@ class AuthTSgroupAdmin(admin.ModelAdmin):
 class StateGroupAdmin(admin.ModelAdmin):
     list_display = ('state', 'ts_group')
     search_fields = ('state__name', 'ts_group__ts_group_name')
-
-
-admin.site.register(AuthTS, AuthTSgroupAdmin)
-admin.site.register(Teamspeak3User, Teamspeak3UserAdmin)

allianceauth/services/modules/xenforo/admin.py

@@ -1,9 +1,10 @@
 from django.contrib import admin
+
 from .models import XenforoUser
+from ...admin import ServicesUserAdmin
 
 
-class XenforoUserAdmin(admin.ModelAdmin):
-        list_display = ('user', 'username')
-        search_fields = ('user__username', 'username')
-
-admin.site.register(XenforoUser, XenforoUserAdmin)
+@admin.register(XenforoUser)
+class XenforoUserAdmin(ServicesUserAdmin):
+    list_display = ServicesUserAdmin.list_display + ('username',)         
+    search_fields = ServicesUserAdmin.search_fields + ('username', )