From 98ff00bc62ea2ee1cdcaa7273cf961e9425c724c Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 29 Jun 2021 13:44:46 -0400 Subject: [PATCH] Fixes #6676: Fix device/VM counts per cluster under cluster type/group views --- docs/release-notes/version-2.11.md | 1 + netbox/virtualization/views.py | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/docs/release-notes/version-2.11.md b/docs/release-notes/version-2.11.md index e1840319e..83987ec93 100644 --- a/docs/release-notes/version-2.11.md +++ b/docs/release-notes/version-2.11.md @@ -12,6 +12,7 @@ * [#6637](https://github.com/netbox-community/netbox/issues/6637) - Fix group assignment in "available VLANs" link under VLAN group view * [#6640](https://github.com/netbox-community/netbox/issues/6640) - Disallow numeric values in custom text fields * [#6652](https://github.com/netbox-community/netbox/issues/6652) - Fix exception when adding components in bulk to multiple devices +* [#6676](https://github.com/netbox-community/netbox/issues/6676) - Fix device/VM counts per cluster under cluster type/group views --- diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py index 421278d6e..fe0d5322f 100644 --- a/netbox/virtualization/views.py +++ b/netbox/virtualization/views.py @@ -34,6 +34,9 @@ class ClusterTypeView(generic.ObjectView): def get_extra_context(self, request, instance): clusters = Cluster.objects.restrict(request.user, 'view').filter( type=instance + ).annotate( + device_count=count_related(Device, 'cluster'), + vm_count=count_related(VirtualMachine, 'cluster') ) clusters_table = tables.ClusterTable(clusters) @@ -93,6 +96,9 @@ class ClusterGroupView(generic.ObjectView): def get_extra_context(self, request, instance): clusters = Cluster.objects.restrict(request.user, 'view').filter( group=instance + ).annotate( + device_count=count_related(Device, 'cluster'), + vm_count=count_related(VirtualMachine, 'cluster') ) clusters_table = tables.ClusterTable(clusters)