Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2026-02-16 20:16:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

let pre-commit do some work

Browse Source
This commit is contained in:
Ariel Rin
2023-05-03 13:18:05 +10:00
parent 98aa44c070
commit 3b19db2564
26 changed files with 39 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
allianceauth/services/modules/teamspeak3/admin.py
View File

@@ -36,10 +36,12 @@ class AuthTSgroupAdmin(admin.ModelAdmin):
kwargs['queryset'] = TSgroup.objects.exclude(ts_group_name__in=ReservedGroupName.objects.values_list('name', flat=True))
return super().formfield_for_manytomany(db_field, request, **kwargs)
@admin.display(
description='ts groups'
)
def _ts_group(self, obj):
return [x for x in obj.ts_group.all().order_by('ts_group_id')]
_ts_group.short_description = 'ts groups'
# _ts_group.admin_order_field = 'profile__state'

8
allianceauth/services/modules/teamspeak3/tests.py
View File

@@ -462,12 +462,12 @@ class Teamspeak3AdminTestCase(TestCase):
def test_field_queryset_no_reserved_names(self):
"""Ensure all groups are listed when no reserved names"""
form = self.admin.get_form(request)
self.assertQuerysetEqual(form.base_fields['auth_group']._get_queryset(), Group.objects.all())
self.assertQuerysetEqual(form.base_fields['ts_group']._get_queryset(), TSgroup.objects.all())
self.assertQuerySetEqual(form.base_fields['auth_group']._get_queryset(), Group.objects.all())
self.assertQuerySetEqual(form.base_fields['ts_group']._get_queryset(), TSgroup.objects.all())
def test_field_queryset_reserved_names(self):
"""Ensure reserved group names are filtered out"""
ReservedGroupName.objects.bulk_create([ReservedGroupName(name='test', reason='tests', created_by='Bob')])
form = self.admin.get_form(request)
self.assertQuerysetEqual(form.base_fields['auth_group']._get_queryset(), Group.objects.none())
self.assertQuerysetEqual(form.base_fields['ts_group']._get_queryset(), TSgroup.objects.none())
self.assertQuerySetEqual(form.base_fields['auth_group']._get_queryset(), Group.objects.none())
self.assertQuerySetEqual(form.base_fields['ts_group']._get_queryset(), TSgroup.objects.none())

2
allianceauth/services/modules/teamspeak3/urls.py
View File

@@ -1,4 +1,4 @@
from django.conf.urls import include
from django.urls import include
from django.urls import path
from . import views