From bb15de6d1a9b3f9275ccb577b8bea3fc8ceba823 Mon Sep 17 00:00:00 2001 From: Ariel Rin Date: Tue, 14 Sep 2021 04:32:37 +0000 Subject: [PATCH 1/2] Version Bump v2.8.7 --- allianceauth/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/allianceauth/__init__.py b/allianceauth/__init__.py index 30bcaf07..be0e9ad4 100644 --- a/allianceauth/__init__.py +++ b/allianceauth/__init__.py @@ -1,7 +1,7 @@ # This will make sure the app is always imported when # Django starts so that shared_task will use this app. -__version__ = '2.8.6' +__version__ = '2.8.7' __title__ = 'Alliance Auth' __url__ = 'https://gitlab.com/allianceauth/allianceauth' NAME = '%s v%s' % (__title__, __version__) From 8486b95917a48d760bb6ba05795a40c19a2440d0 Mon Sep 17 00:00:00 2001 From: Crashtec Date: Sun, 10 Oct 2021 15:11:30 -0400 Subject: [PATCH 2/2] Add override to delete the user from discord itself --- allianceauth/services/modules/discord/admin.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/allianceauth/services/modules/discord/admin.py b/allianceauth/services/modules/discord/admin.py index ae9adad5..cf946fd6 100644 --- a/allianceauth/services/modules/discord/admin.py +++ b/allianceauth/services/modules/discord/admin.py @@ -30,5 +30,10 @@ class DiscordUserAdmin(ServicesUserAdmin): else: return '' + + def delete_queryset(self, request, queryset): + for user in queryset: + user.delete_user() + _username.short_description = 'Discord Username' - _username.admin_order_field = 'username' + _username.admin_order_field = 'username' \ No newline at end of file