NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-27 19:08:38 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

17170 fixes

Browse Source
This commit is contained in:
Arthur 2025-03-12 13:51:10 -07:00
parent c7827c7960
commit e1f8ff169c
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/tenancy/api/serializers_/contacts.py
View File

@ -48,7 +48,7 @@ class ContactSerializer(NetBoxModelSerializer):
class Meta: class Meta:
model = Contact model = Contact
fields = [ fields = [
'id', 'url', 'display_url', 'display', 'group', 'name', 'title', 'phone', 'email', 'address', 'link', 'id', 'url', 'display_url', 'display', 'groups', 'name', 'title', 'phone', 'email', 'address', 'link',
'description', 'comments', 'tags', 'custom_fields', 'created', 'last_updated', 'description', 'comments', 'tags', 'custom_fields', 'created', 'last_updated',
] ]
brief_fields = ('id', 'url', 'display', 'name', 'description') brief_fields = ('id', 'url', 'display', 'name', 'description')

5
netbox/tenancy/filtersets.py
View File

@ -68,9 +68,9 @@ class ContactFilterSet(NetBoxModelFilterSet):
) )
group = TreeNodeMultipleChoiceFilter( group = TreeNodeMultipleChoiceFilter(
queryset=ContactGroup.objects.all(), queryset=ContactGroup.objects.all(),
field_name='groups__slug', field_name='groups',
lookup_expr='in',
to_field_name='slug', to_field_name='slug',
lookup_expr='in',
label=_('Contact group (slug)'), label=_('Contact group (slug)'),
) )
@ -112,7 +112,6 @@ class ContactAssignmentFilterSet(NetBoxModelFilterSet):
group = TreeNodeMultipleChoiceFilter( group = TreeNodeMultipleChoiceFilter(
queryset=ContactGroup.objects.all(), queryset=ContactGroup.objects.all(),
field_name='contact__groups__slug', field_name='contact__groups__slug',
lookup_expr='in',
to_field_name='slug', to_field_name='slug',
label=_('Contact group (slug)'), label=_('Contact group (slug)'),
) )

12
netbox/tenancy/tests/test_api.py
View File

@ -183,20 +183,22 @@ class ContactTest(APIViewTestCases.APIViewTestCase):
) )
contacts = ( contacts = (
Contact(name='Contact 1', group=contact_groups[0]), Contact(name='Contact 1'),
Contact(name='Contact 2', group=contact_groups[0]), Contact(name='Contact 2'),
Contact(name='Contact 3', group=contact_groups[0]), Contact(name='Contact 3'),
) )
Contact.objects.bulk_create(contacts) Contact.objects.bulk_create(contacts)
contacts[0].groups.add(contact_groups[0])
contacts[1].groups.add(contact_groups[0])
cls.create_data = [ cls.create_data = [
{ {
'name': 'Contact 4', 'name': 'Contact 4',
'group': contact_groups[1].pk, 'groups': [contact_groups[1].pk],
}, },
{ {
'name': 'Contact 5', 'name': 'Contact 5',
'group': contact_groups[1].pk, 'groups': [contact_groups[1].pk],
}, },
{ {
'name': 'Contact 6', 'name': 'Contact 6',

9
netbox/tenancy/tests/test_filtersets.py
View File

@ -311,11 +311,14 @@ class ContactAssignmentTestCase(TestCase, ChangeLoggedFilterSetTests):
ContactRole.objects.bulk_create(contact_roles) ContactRole.objects.bulk_create(contact_roles)
contacts = ( contacts = (
Contact(name='Contact 1', group=contact_groups[0]), Contact(name='Contact 1'),
Contact(name='Contact 2', group=contact_groups[1]), Contact(name='Contact 2'),
Contact(name='Contact 3', group=contact_groups[2]), Contact(name='Contact 3'),
) )
Contact.objects.bulk_create(contacts) Contact.objects.bulk_create(contacts)
contacts[0].groups.add(contact_groups[0])
contacts[1].groups.add(contact_groups[1])
contacts[2].groups.add(contact_groups[2])
assignments = ( assignments = (
ContactAssignment(object=sites[0], contact=contacts[0], role=contact_roles[0]), ContactAssignment(object=sites[0], contact=contacts[0], role=contact_roles[0]),