From cfa60e4b45e94c91d8009e43fed4ccb61c0f95a5 Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Wed, 25 Jan 2023 16:20:52 -0500
Subject: [PATCH] Standardize linking to related objects in tables

---
 netbox/circuits/tables/circuits.py |  4 +++-
 netbox/dcim/tables/devices.py      |  3 +++
 netbox/dcim/tables/devicetypes.py  | 21 +++++++++++++++------
 netbox/dcim/tables/racks.py        |  6 +++++-
 netbox/dcim/views.py               | 11 +++++++++--
 5 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/netbox/circuits/tables/circuits.py b/netbox/circuits/tables/circuits.py
index 477f9c1ab..b3f62d5fc 100644
--- a/netbox/circuits/tables/circuits.py
+++ b/netbox/circuits/tables/circuits.py
@@ -28,7 +28,9 @@ class CircuitTypeTable(NetBoxTable):
     tags = columns.TagColumn(
         url_name='circuits:circuittype_list'
     )
-    circuit_count = tables.Column(
+    circuit_count = columns.LinkedCountColumn(
+        viewname='circuits:circuit_list',
+        url_params={'type_id': 'pk'},
         verbose_name='Circuits'
     )
 
diff --git a/netbox/dcim/tables/devices.py b/netbox/dcim/tables/devices.py
index 730309156..904e96b83 100644
--- a/netbox/dcim/tables/devices.py
+++ b/netbox/dcim/tables/devices.py
@@ -107,6 +107,9 @@ class PlatformTable(NetBoxTable):
     name = tables.Column(
         linkify=True
     )
+    manufacturer = tables.Column(
+        linkify=True
+    )
     device_count = columns.LinkedCountColumn(
         viewname='dcim:device_list',
         url_params={'platform_id': 'pk'},
diff --git a/netbox/dcim/tables/devicetypes.py b/netbox/dcim/tables/devicetypes.py
index 39df7ce03..dff697588 100644
--- a/netbox/dcim/tables/devicetypes.py
+++ b/netbox/dcim/tables/devicetypes.py
@@ -34,13 +34,21 @@ class ManufacturerTable(ContactsColumnMixin, NetBoxTable):
         url_params={'manufacturer_id': 'pk'},
         verbose_name='Device Types'
     )
-    inventoryitem_count = tables.Column(
+    moduletype_count = columns.LinkedCountColumn(
+        viewname='dcim:moduletype_list',
+        url_params={'manufacturer_id': 'pk'},
+        verbose_name='Module Types'
+    )
+    inventoryitem_count = columns.LinkedCountColumn(
+        viewname='dcim:inventoryitem_list',
+        url_params={'manufacturer_id': 'pk'},
         verbose_name='Inventory Items'
     )
-    platform_count = tables.Column(
+    platform_count = columns.LinkedCountColumn(
+        viewname='dcim:platform_list',
+        url_params={'manufacturer_id': 'pk'},
         verbose_name='Platforms'
     )
-    slug = tables.Column()
     tags = columns.TagColumn(
         url_name='dcim:manufacturer_list'
     )
@@ -48,11 +56,12 @@ class ManufacturerTable(ContactsColumnMixin, NetBoxTable):
     class Meta(NetBoxTable.Meta):
         model = models.Manufacturer
         fields = (
-            'pk', 'id', 'name', 'devicetype_count', 'inventoryitem_count', 'platform_count', 'description', 'slug',
-            'tags', 'contacts', 'actions', 'created', 'last_updated',
+            'pk', 'id', 'name', 'devicetype_count', 'moduletype_count', 'inventoryitem_count', 'platform_count',
+            'description', 'slug', 'tags', 'contacts', 'actions', 'created', 'last_updated',
         )
         default_columns = (
-            'pk', 'name', 'devicetype_count', 'inventoryitem_count', 'platform_count', 'description', 'slug',
+            'pk', 'name', 'devicetype_count', 'moduletype_count', 'inventoryitem_count', 'platform_count',
+            'description', 'slug',
         )
 
 
diff --git a/netbox/dcim/tables/racks.py b/netbox/dcim/tables/racks.py
index cb9aae6fd..657754017 100644
--- a/netbox/dcim/tables/racks.py
+++ b/netbox/dcim/tables/racks.py
@@ -19,7 +19,11 @@ __all__ = (
 
 class RackRoleTable(NetBoxTable):
     name = tables.Column(linkify=True)
-    rack_count = tables.Column(verbose_name='Racks')
+    rack_count = columns.LinkedCountColumn(
+        viewname='dcim:rack_list',
+        url_params={'role_id': 'pk'},
+        verbose_name='Racks'
+    )
     color = columns.ColorColumn()
     tags = columns.TagColumn(
         url_name='dcim:rackrole_list'
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 1dbeb4d7e..9e116e331 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -797,6 +797,7 @@ class RackReservationBulkDeleteView(generic.BulkDeleteView):
 class ManufacturerListView(generic.ObjectListView):
     queryset = Manufacturer.objects.annotate(
         devicetype_count=count_related(DeviceType, 'manufacturer'),
+        moduletype_count=count_related(ModuleType, 'manufacturer'),
         inventoryitem_count=count_related(InventoryItem, 'manufacturer'),
         platform_count=count_related(Platform, 'manufacturer')
     )
@@ -841,7 +842,10 @@ class ManufacturerBulkImportView(generic.BulkImportView):
 
 class ManufacturerBulkEditView(generic.BulkEditView):
     queryset = Manufacturer.objects.annotate(
-        devicetype_count=count_related(DeviceType, 'manufacturer')
+        devicetype_count=count_related(DeviceType, 'manufacturer'),
+        moduletype_count=count_related(ModuleType, 'manufacturer'),
+        inventoryitem_count=count_related(InventoryItem, 'manufacturer'),
+        platform_count=count_related(Platform, 'manufacturer')
     )
     filterset = filtersets.ManufacturerFilterSet
     table = tables.ManufacturerTable
@@ -850,7 +854,10 @@ class ManufacturerBulkEditView(generic.BulkEditView):
 
 class ManufacturerBulkDeleteView(generic.BulkDeleteView):
     queryset = Manufacturer.objects.annotate(
-        devicetype_count=count_related(DeviceType, 'manufacturer')
+        devicetype_count=count_related(DeviceType, 'manufacturer'),
+        moduletype_count=count_related(ModuleType, 'manufacturer'),
+        inventoryitem_count=count_related(InventoryItem, 'manufacturer'),
+        platform_count=count_related(Platform, 'manufacturer')
     )
     table = tables.ManufacturerTable