From 18c9ee2f9da59bdd4e97d26938c27e7ffa706631 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Mon, 7 Mar 2022 13:44:27 -0500 Subject: [PATCH] Closes #8804: Include module type count on manufacturer view --- netbox/dcim/views.py | 8 ++++++-- netbox/templates/dcim/manufacturer.html | 6 ++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 520820566..7105503bc 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -735,21 +735,25 @@ class ManufacturerView(generic.ObjectView): queryset = Manufacturer.objects.all() def get_extra_context(self, request, instance): - devicetypes = DeviceType.objects.restrict(request.user, 'view').filter( + device_types = DeviceType.objects.restrict(request.user, 'view').filter( manufacturer=instance ).annotate( instance_count=count_related(Device, 'device_type') ) + module_types = ModuleType.objects.restrict(request.user, 'view').filter( + manufacturer=instance + ) inventory_items = InventoryItem.objects.restrict(request.user, 'view').filter( manufacturer=instance ) - devicetypes_table = tables.DeviceTypeTable(devicetypes, exclude=('manufacturer',)) + devicetypes_table = tables.DeviceTypeTable(device_types, exclude=('manufacturer',)) devicetypes_table.configure(request) return { 'devicetypes_table': devicetypes_table, 'inventory_item_count': inventory_items.count(), + 'module_type_count': module_types.count(), } diff --git a/netbox/templates/dcim/manufacturer.html b/netbox/templates/dcim/manufacturer.html index c79ec923e..43d16afcb 100644 --- a/netbox/templates/dcim/manufacturer.html +++ b/netbox/templates/dcim/manufacturer.html @@ -34,6 +34,12 @@ {{ devicetypes_table.rows|length }} + + Module types + + {{ module_type_count }} + + Inventory Items