NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-24 09:28:38 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge pull request #10215 from netbox-community/10060-searchjournal

Browse Source 
#10060 add journal entry to global search
This commit is contained in:
Jeremy Stretch 2022-08-30 13:57:32 -04:00 committed by GitHub
commit da03b22fe4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
netbox/netbox/search.py
View File

@ -2,6 +2,8 @@ import circuits.filtersets
import circuits.tables import circuits.tables
import dcim.filtersets import dcim.filtersets
import dcim.tables import dcim.tables
import extras.filtersets
import extras.tables
import ipam.filtersets import ipam.filtersets
import ipam.tables import ipam.tables
import tenancy.filtersets import tenancy.filtersets
@ -15,6 +17,7 @@ from dcim.models import (
Cable, Device, DeviceType, Interface, Location, Module, ModuleType, PowerFeed, Rack, RackReservation, Site, Cable, Device, DeviceType, Interface, Location, Module, ModuleType, PowerFeed, Rack, RackReservation, Site,
VirtualChassis, VirtualChassis,
) )
from extras.models import JournalEntry
from ipam.models import Aggregate, ASN, IPAddress, Prefix, Service, VLAN, VRF from ipam.models import Aggregate, ASN, IPAddress, Prefix, Service, VLAN, VRF
from tenancy.models import Contact, Tenant, ContactAssignment from tenancy.models import Contact, Tenant, ContactAssignment
from utilities.utils import count_related from utilities.utils import count_related
@ -238,6 +241,15 @@ WIRELESS_TYPES = {
}, },
} }
JOURNAL_TYPES = {
'journalentry': {
'queryset': JournalEntry.objects.prefetch_related('assigned_object', 'created_by'),
'filterset': extras.filtersets.JournalEntryFilterSet,
'table': extras.tables.JournalEntryTable,
'url': 'extras:journalentry_list',
},
}
SEARCH_TYPE_HIERARCHY = { SEARCH_TYPE_HIERARCHY = {
'Circuits': CIRCUIT_TYPES, 'Circuits': CIRCUIT_TYPES,
'DCIM': DCIM_TYPES, 'DCIM': DCIM_TYPES,
@ -245,6 +257,7 @@ SEARCH_TYPE_HIERARCHY = {
'Tenancy': TENANCY_TYPES, 'Tenancy': TENANCY_TYPES,
'Virtualization': VIRTUALIZATION_TYPES, 'Virtualization': VIRTUALIZATION_TYPES,
'Wireless': WIRELESS_TYPES, 'Wireless': WIRELESS_TYPES,
'Journal': JOURNAL_TYPES,
} }