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 6 Packages Projects Releases Wiki Activity

Closes #8381: Add contacts to global search function

Browse Source
This commit is contained in:
jeremystretch 2022-01-18 15:40:19 -05:00
parent 21468fff25
commit 1f2d4fd2b3
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes/version-3.1.md
View File

@ -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

12
netbox/netbox/constants.py
View File

@ -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.filtersets import ContactFilterSet, TenantFilterSet
from tenancy.models import Tenant from tenancy.models import Contact, Tenant
from tenancy.tables import 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
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',
}),
)) ))