diff --git a/netbox/circuits/tables/providers.py b/netbox/circuits/tables/providers.py index c45f178b5..e2a1d93f6 100644 --- a/netbox/circuits/tables/providers.py +++ b/netbox/circuits/tables/providers.py @@ -11,7 +11,7 @@ __all__ = ( ) -class ProviderTable(NetBoxTable, ContactsColumnMixin): +class ProviderTable(ContactsColumnMixin, NetBoxTable): name = tables.Column( linkify=True ) diff --git a/netbox/dcim/tables/devicetypes.py b/netbox/dcim/tables/devicetypes.py index f2cf17175..566c56a90 100644 --- a/netbox/dcim/tables/devicetypes.py +++ b/netbox/dcim/tables/devicetypes.py @@ -39,7 +39,7 @@ __all__ = ( # Manufacturers # -class ManufacturerTable(NetBoxTable, ContactsColumnMixin): +class ManufacturerTable(ContactsColumnMixin, NetBoxTable): name = tables.Column( linkify=True ) diff --git a/netbox/dcim/tables/power.py b/netbox/dcim/tables/power.py index 18a4536de..04012ea4a 100644 --- a/netbox/dcim/tables/power.py +++ b/netbox/dcim/tables/power.py @@ -16,7 +16,7 @@ __all__ = ( # Power panels # -class PowerPanelTable(NetBoxTable, ContactsColumnMixin): +class PowerPanelTable(ContactsColumnMixin, NetBoxTable): name = tables.Column( linkify=True ) diff --git a/netbox/dcim/tables/sites.py b/netbox/dcim/tables/sites.py index 484ed08c1..f013025f7 100644 --- a/netbox/dcim/tables/sites.py +++ b/netbox/dcim/tables/sites.py @@ -18,7 +18,7 @@ __all__ = ( # Regions # -class RegionTable(NetBoxTable, ContactsColumnMixin): +class RegionTable(ContactsColumnMixin, NetBoxTable): name = columns.MPTTColumn( linkify=True ) @@ -44,7 +44,7 @@ class RegionTable(NetBoxTable, ContactsColumnMixin): # Site groups # -class SiteGroupTable(NetBoxTable, ContactsColumnMixin): +class SiteGroupTable(ContactsColumnMixin, NetBoxTable): name = columns.MPTTColumn( linkify=True ) diff --git a/netbox/tenancy/tables/columns.py b/netbox/tenancy/tables/columns.py index a071d9c46..491d0488f 100644 --- a/netbox/tenancy/tables/columns.py +++ b/netbox/tenancy/tables/columns.py @@ -3,10 +3,10 @@ import django_tables2 as tables from netbox.tables import columns __all__ = ( + 'ContactsColumnMixin', 'TenantColumn', 'TenantGroupColumn', 'TenancyColumnsMixin', - 'ContactsColumnMixin', ) diff --git a/netbox/tenancy/tables/tenants.py b/netbox/tenancy/tables/tenants.py index 0f96e752e..9c404fb4b 100644 --- a/netbox/tenancy/tables/tenants.py +++ b/netbox/tenancy/tables/tenants.py @@ -31,7 +31,7 @@ class TenantGroupTable(NetBoxTable): default_columns = ('pk', 'name', 'tenant_count', 'description') -class TenantTable(NetBoxTable, ContactsColumnMixin): +class TenantTable(ContactsColumnMixin, NetBoxTable): name = tables.Column( linkify=True ) diff --git a/netbox/virtualization/tables/clusters.py b/netbox/virtualization/tables/clusters.py index a99b8595e..fec539b8c 100644 --- a/netbox/virtualization/tables/clusters.py +++ b/netbox/virtualization/tables/clusters.py @@ -32,7 +32,7 @@ class ClusterTypeTable(NetBoxTable): default_columns = ('pk', 'name', 'cluster_count', 'description') -class ClusterGroupTable(NetBoxTable, ContactsColumnMixin): +class ClusterGroupTable(ContactsColumnMixin, NetBoxTable): name = tables.Column( linkify=True )