mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Fixes #1858: Include device/CM count for cluster list in global search results

Browse Source
This commit is contained in:
Jeremy Stretch
2018-02-02 17:11:46 -05:00
parent 7f5a3fffd3
commit 835d13542f
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/netbox/views.py
View File

@ -119,7 +119,7 @@ SEARCH_TYPES = OrderedDict((
}), }),
# Virtualization # Virtualization
('cluster', { ('cluster', {
'queryset': Cluster.objects.all(), 'queryset': Cluster.objects.select_related('type', 'group'),
'filter': ClusterFilter, 'filter': ClusterFilter,
'table': ClusterTable, 'table': ClusterTable,
'url': 'virtualization:cluster_list', 'url': 'virtualization:cluster_list',

5
netbox/virtualization/tables.py
View File

@ -80,8 +80,9 @@ class ClusterGroupTable(BaseTable):
class ClusterTable(BaseTable): class ClusterTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
name = tables.LinkColumn() name = tables.LinkColumn()
device_count = tables.Column(verbose_name='Devices') site = tables.LinkColumn('dcim:site', args=[Accessor('site.slug')])
vm_count = tables.Column(verbose_name='VMs') device_count = tables.Column(accessor=Accessor('devices.count'), orderable=False, verbose_name='Devices')
vm_count = tables.Column(accessor=Accessor('virtual_machines.count'), orderable=False, verbose_name='VMs')
class Meta(BaseTable.Meta): class Meta(BaseTable.Meta):
model = Cluster model = Cluster

5
netbox/virtualization/views.py
View File

@ -99,10 +99,7 @@ class ClusterGroupBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
# #
class ClusterListView(ObjectListView): class ClusterListView(ObjectListView):
queryset = Cluster.objects.annotate( queryset = Cluster.objects.select_related('type', 'group')
device_count=Count('devices', distinct=True),
vm_count=Count('virtual_machines', distinct=True)
)
table = tables.ClusterTable table = tables.ClusterTable
filter = filters.ClusterFilter filter = filters.ClusterFilter
filter_form = forms.ClusterFilterForm filter_form = forms.ClusterFilterForm