Explorar o código

Closes #8381: Add contacts to global search function

jeremystretch %!s(int64=4) %!d(string=hai) anos
pai
achega
1f2d4fd2b3
Modificáronse 2 ficheiros con 10 adicións e 3 borrados
  1. 1 0
      docs/release-notes/version-3.1.md
  2. 9 3
      netbox/netbox/constants.py

+ 1 - 0
docs/release-notes/version-3.1.md

@@ -6,6 +6,7 @@
 
 
 * [#8275](https://github.com/netbox-community/netbox/issues/8275) - Introduce alternative ASDOT-formatted column for ASNs
 * [#8275](https://github.com/netbox-community/netbox/issues/8275) - Introduce alternative ASDOT-formatted column for ASNs
 * [#8367](https://github.com/netbox-community/netbox/issues/8367) - Add ASNs to global search function
 * [#8367](https://github.com/netbox-community/netbox/issues/8367) - Add ASNs to global search function
+* [#8381](https://github.com/netbox-community/netbox/issues/8381) - Add contacts to global search function
 
 
 ### Bug Fixes
 ### Bug Fixes
 
 

+ 9 - 3
netbox/netbox/constants.py

@@ -17,9 +17,9 @@ 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 TenantFilterSet
-from tenancy.models import Tenant
-from tenancy.tables import TenantTable
+from tenancy.filtersets import ContactFilterSet, TenantFilterSet
+from tenancy.models import Contact, Tenant
+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
 from virtualization.models import Cluster, VirtualMachine
 from virtualization.models import Cluster, VirtualMachine
@@ -185,4 +185,10 @@ SEARCH_TYPES = OrderedDict((
         'table': TenantTable,
         'table': TenantTable,
         'url': 'tenancy:tenant_list',
         'url': 'tenancy:tenant_list',
     }),
     }),
+    ('contact', {
+        'queryset': Contact.objects.prefetch_related('group', 'assignments'),
+        'filterset': ContactFilterSet,
+        'table': ContactTable,
+        'url': 'tenancy:contact_list',
+    }),
 ))
 ))