Compare commits

...

4 Commits

Author SHA1 Message Date
Ariel Rin
7412675bfb Version Bump v2.8.8 2021-10-17 09:34:41 +00:00
Joel Falknau
ad953efe77 Require Django-ESI 3.x
(cherry picked from commit 98619a0eb8)
2021-10-17 09:31:54 +00:00
Ariel Rin
5b26757662 Merge branch 'features/kick-from-discord-admin' into 'master'
Add override to delete the user from discord itself

See merge request allianceauth/allianceauth!1337
2021-10-17 07:34:22 +00:00
Crashtec
8486b95917 Add override to delete the user from discord itself 2021-10-10 15:19:46 -04:00
3 changed files with 8 additions and 3 deletions

View File

@@ -1,7 +1,7 @@
# This will make sure the app is always imported when # This will make sure the app is always imported when
# Django starts so that shared_task will use this app. # Django starts so that shared_task will use this app.
__version__ = '2.8.7' __version__ = '2.8.8'
__title__ = 'Alliance Auth' __title__ = 'Alliance Auth'
__url__ = 'https://gitlab.com/allianceauth/allianceauth' __url__ = 'https://gitlab.com/allianceauth/allianceauth'
NAME = '%s v%s' % (__title__, __version__) NAME = '%s v%s' % (__title__, __version__)

View File

@@ -30,5 +30,10 @@ class DiscordUserAdmin(ServicesUserAdmin):
else: else:
return '' return ''
def delete_queryset(self, request, queryset):
for user in queryset:
user.delete_user()
_username.short_description = 'Discord Username' _username.short_description = 'Discord Username'
_username.admin_order_field = 'username' _username.admin_order_field = 'username'

View File

@@ -33,7 +33,7 @@ install_requires = [
'sleekxmpp', 'sleekxmpp',
'pydiscourse', 'pydiscourse',
'django-esi>=2.0.4,<3.0' 'django-esi>=3.0.0,<4.0.0'
] ]
testing_extras = [ testing_extras = [