From c7ece43a1887bdc1bb3daf894c0929b9babd0505 Mon Sep 17 00:00:00 2001
From: Kim Johansson <kim@kumiko.se>
Date: Sun, 10 Jul 2022 17:16:12 +0200
Subject: [PATCH] Remove Tenant Group from child tables

Removes the Tenant Group column from tables which aren't configurable
by the user.
---
 netbox/ipam/tables/ip.py    | 7 ++++---
 netbox/ipam/tables/vlans.py | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/netbox/ipam/tables/ip.py b/netbox/ipam/tables/ip.py
index e61d99fd8..bec05eeff 100644
--- a/netbox/ipam/tables/ip.py
+++ b/netbox/ipam/tables/ip.py
@@ -4,7 +4,7 @@ from django_tables2.utils import Accessor
 
 from ipam.models import *
 from netbox.tables import NetBoxTable, columns
-from tenancy.tables import TenancyColumnsMixin
+from tenancy.tables import TenancyColumnsMixin, TenantColumn
 
 __all__ = (
     'AggregateTable',
@@ -409,7 +409,7 @@ class IPAddressAssignTable(NetBoxTable):
         orderable = False
 
 
-class AssignedIPAddressesTable(TenancyColumnsMixin, NetBoxTable):
+class AssignedIPAddressesTable(NetBoxTable):
     """
     List IP addresses assigned to an object.
     """
@@ -422,8 +422,9 @@ class AssignedIPAddressesTable(TenancyColumnsMixin, NetBoxTable):
         verbose_name='VRF'
     )
     status = columns.ChoiceFieldColumn()
+    tenant = TenantColumn()
 
     class Meta(NetBoxTable.Meta):
         model = IPAddress
-        fields = ('address', 'vrf', 'status', 'role', 'tenant', 'tenant_group', 'description')
+        fields = ('address', 'vrf', 'status', 'role', 'tenant', 'description')
         exclude = ('id', )
diff --git a/netbox/ipam/tables/vlans.py b/netbox/ipam/tables/vlans.py
index 4329177eb..7878de507 100644
--- a/netbox/ipam/tables/vlans.py
+++ b/netbox/ipam/tables/vlans.py
@@ -5,7 +5,7 @@ from django_tables2.utils import Accessor
 from dcim.models import Interface
 from ipam.models import *
 from netbox.tables import NetBoxTable, columns
-from tenancy.tables import TenancyColumnsMixin
+from tenancy.tables import TenancyColumnsMixin, TenantColumn
 from virtualization.models import VMInterface
 
 __all__ = (
@@ -173,7 +173,7 @@ class VLANVirtualMachinesTable(VLANMembersTable):
         exclude = ('id', )
 
 
-class InterfaceVLANTable(TenancyColumnsMixin, NetBoxTable):
+class InterfaceVLANTable(NetBoxTable):
     """
     List VLANs assigned to a specific Interface.
     """
@@ -189,6 +189,7 @@ class InterfaceVLANTable(TenancyColumnsMixin, NetBoxTable):
         accessor=Accessor('group__name'),
         verbose_name='Group'
     )
+    tenant = TenantColumn()
     status = columns.ChoiceFieldColumn()
     role = tables.Column(
         linkify=True
@@ -196,7 +197,7 @@ class InterfaceVLANTable(TenancyColumnsMixin, NetBoxTable):
 
     class Meta(NetBoxTable.Meta):
         model = VLAN
-        fields = ('vid', 'tagged', 'site', 'group', 'name', 'tenant', 'tenant_group', 'status', 'role', 'description')
+        fields = ('vid', 'tagged', 'site', 'group', 'name', 'tenant', 'status', 'role', 'description')
         exclude = ('id', )
 
     def __init__(self, interface, *args, **kwargs):