NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-23 04:22:01 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge pull request #8584 from 991jo/assigned_contacts_fix

Browse Source 
Fixes #8577: Contact assignment amounts not shown during contact glob…
This commit is contained in:
Jeremy Stretch 2022-02-11 15:49:02 -05:00 committed by GitHub
commit 2c1e681984
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/netbox/constants.py
View File

@ -18,7 +18,7 @@ from ipam.filtersets import (
from ipam.models import Aggregate, ASN, IPAddress, Prefix, VLAN, VRF from ipam.models import Aggregate, ASN, IPAddress, Prefix, VLAN, VRF
from ipam.tables import AggregateTable, ASNTable, IPAddressTable, PrefixTable, VLANTable, VRFTable from ipam.tables import AggregateTable, ASNTable, IPAddressTable, PrefixTable, VLANTable, VRFTable
from tenancy.filtersets import ContactFilterSet, TenantFilterSet from tenancy.filtersets import ContactFilterSet, TenantFilterSet
from tenancy.models import Contact, Tenant from tenancy.models import Contact, Tenant, ContactAssignment
from tenancy.tables import ContactTable, TenantTable from tenancy.tables import ContactTable, TenantTable
from utilities.utils import count_related from utilities.utils import count_related
from virtualization.filtersets import ClusterFilterSet, VirtualMachineFilterSet from virtualization.filtersets import ClusterFilterSet, VirtualMachineFilterSet
@ -186,7 +186,7 @@ SEARCH_TYPES = OrderedDict((
'url': 'tenancy:tenant_list', 'url': 'tenancy:tenant_list',
}), }),
('contact', { ('contact', {
'queryset': Contact.objects.prefetch_related('group', 'assignments'), 'queryset': Contact.objects.prefetch_related('group', 'assignments').annotate(assignment_count=count_related(ContactAssignment, 'contact')),
'filterset': ContactFilterSet, 'filterset': ContactFilterSet,
'table': ContactTable, 'table': ContactTable,
'url': 'tenancy:contact_list', 'url': 'tenancy:contact_list',