Просмотр исходного кода

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

#10060 add journal entry to global search
Jeremy Stretch 3 лет назад
Родитель
Сommit
da03b22fe4
1 измененных файлов с 13 добавлено и 0 удалено
  1. 13 0
      netbox/netbox/search.py

+ 13 - 0
netbox/netbox/search.py

@@ -2,6 +2,8 @@ import circuits.filtersets
 import circuits.tables
 import dcim.filtersets
 import dcim.tables
+import extras.filtersets
+import extras.tables
 import ipam.filtersets
 import ipam.tables
 import tenancy.filtersets
@@ -15,6 +17,7 @@ from dcim.models import (
     Cable, Device, DeviceType, Interface, Location, Module, ModuleType, PowerFeed, Rack, RackReservation, Site,
     VirtualChassis,
 )
+from extras.models import JournalEntry
 from ipam.models import Aggregate, ASN, IPAddress, Prefix, Service, VLAN, VRF
 from tenancy.models import Contact, Tenant, ContactAssignment
 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 = {
     'Circuits': CIRCUIT_TYPES,
     'DCIM': DCIM_TYPES,
@@ -245,6 +257,7 @@ SEARCH_TYPE_HIERARCHY = {
     'Tenancy': TENANCY_TYPES,
     'Virtualization': VIRTUALIZATION_TYPES,
     'Wireless': WIRELESS_TYPES,
+    'Journal': JOURNAL_TYPES,
 }