From 8514a5427c9d94552a0f32061bfd91a0970ba93b Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 20 Jul 2020 13:00:33 -0400 Subject: [PATCH] Update related object counts to use dunders in accessor --- netbox/dcim/tables.py | 8 ++++---- netbox/ipam/tables.py | 4 ++-- netbox/virtualization/tables.py | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index 2ef7e21bb..075cee60b 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -503,13 +503,13 @@ class DeviceRoleTable(BaseTable): pk = ToggleColumn() device_count = tables.TemplateColumn( template_code=DEVICEROLE_DEVICE_COUNT, - accessor=Accessor('devices.unrestricted.count'), + accessor=Accessor('devices__unrestricted__count'), orderable=False, verbose_name='Devices' ) vm_count = tables.TemplateColumn( template_code=DEVICEROLE_VM_COUNT, - accessor=Accessor('virtual_machines.unrestricted.count'), + accessor=Accessor('virtual_machines__unrestricted__count'), orderable=False, verbose_name='VMs' ) @@ -534,13 +534,13 @@ class PlatformTable(BaseTable): pk = ToggleColumn() device_count = tables.TemplateColumn( template_code=PLATFORM_DEVICE_COUNT, - accessor=Accessor('devices.count'), + accessor=Accessor('devices__unrestricted__count'), orderable=False, verbose_name='Devices' ) vm_count = tables.TemplateColumn( template_code=PLATFORM_VM_COUNT, - accessor=Accessor('virtual_machines.count'), + accessor=Accessor('virtual_machines__unrestricted__count'), orderable=False, verbose_name='VMs' ) diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py index 87744f652..c695186ee 100644 --- a/netbox/ipam/tables.py +++ b/netbox/ipam/tables.py @@ -283,13 +283,13 @@ class AggregateDetailTable(AggregateTable): class RoleTable(BaseTable): pk = ToggleColumn() prefix_count = tables.TemplateColumn( - accessor=Accessor('prefixes.unrestricted.count'), + accessor=Accessor('prefixes__unrestricted__count'), template_code=ROLE_PREFIX_COUNT, orderable=False, verbose_name='Prefixes' ) vlan_count = tables.TemplateColumn( - accessor=Accessor('vlans.unrestricted.count'), + accessor=Accessor('vlans__unrestricted__count'), template_code=ROLE_VLAN_COUNT, orderable=False, verbose_name='VLANs' diff --git a/netbox/virtualization/tables.py b/netbox/virtualization/tables.py index 003a52b78..c16ff97cd 100644 --- a/netbox/virtualization/tables.py +++ b/netbox/virtualization/tables.py @@ -67,12 +67,12 @@ class ClusterTable(BaseTable): linkify=True ) device_count = tables.Column( - accessor=Accessor('devices.count'), + accessor=Accessor('devices__unrestricted__count'), orderable=False, verbose_name='Devices' ) vm_count = tables.Column( - accessor=Accessor('virtual_machines.count'), + accessor=Accessor('virtual_machines__unrestricted__count'), orderable=False, verbose_name='VMs' )