Browse Source

Closes #1587: Add primary IP column for virtual machines in global search results

Jeremy Stretch 7 years ago
parent
commit
17493ff655
1 changed files with 5 additions and 3 deletions
  1. 5 3
      netbox/netbox/views.py

+ 5 - 3
netbox/netbox/views.py

@@ -27,7 +27,7 @@ from tenancy.models import Tenant
 from tenancy.tables import TenantTable
 from tenancy.tables import TenantTable
 from virtualization.filters import ClusterFilter, VirtualMachineFilter
 from virtualization.filters import ClusterFilter, VirtualMachineFilter
 from virtualization.models import Cluster, VirtualMachine
 from virtualization.models import Cluster, VirtualMachine
-from virtualization.tables import ClusterTable, VirtualMachineTable
+from virtualization.tables import ClusterTable, VirtualMachineDetailTable
 from .forms import SearchForm
 from .forms import SearchForm
 
 
 
 
@@ -126,9 +126,11 @@ SEARCH_TYPES = OrderedDict((
         'url': 'virtualization:cluster_list',
         'url': 'virtualization:cluster_list',
     }),
     }),
     ('virtualmachine', {
     ('virtualmachine', {
-        'queryset': VirtualMachine.objects.select_related('cluster', 'tenant', 'platform'),
+        'queryset': VirtualMachine.objects.select_related(
+            'cluster', 'tenant', 'platform', 'primary_ip4', 'primary_ip6',
+        ),
         'filter': VirtualMachineFilter,
         'filter': VirtualMachineFilter,
-        'table': VirtualMachineTable,
+        'table': VirtualMachineDetailTable,
         'url': 'virtualization:virtualmachine_list',
         'url': 'virtualization:virtualmachine_list',
     }),
     }),
 ))
 ))