NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-25 01:48:38 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Remove Tenant Group from child tables

Browse Source 
Removes the Tenant Group column from tables which aren't configurable
by the user.
This commit is contained in:
Kim Johansson 2022-07-10 17:16:12 +02:00
parent 69a22ffe5e
commit c7ece43a18
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
netbox/ipam/tables/ip.py
View File

@ -4,7 +4,7 @@ from django_tables2.utils import Accessor
from ipam.models import * from ipam.models import *
from netbox.tables import NetBoxTable, columns from netbox.tables import NetBoxTable, columns
from tenancy.tables import TenancyColumnsMixin from tenancy.tables import TenancyColumnsMixin, TenantColumn
__all__ = ( __all__ = (
'AggregateTable', 'AggregateTable',
@ -409,7 +409,7 @@ class IPAddressAssignTable(NetBoxTable):
orderable = False orderable = False
class AssignedIPAddressesTable(TenancyColumnsMixin, NetBoxTable): class AssignedIPAddressesTable(NetBoxTable):
""" """
List IP addresses assigned to an object. List IP addresses assigned to an object.
""" """
@ -422,8 +422,9 @@ class AssignedIPAddressesTable(TenancyColumnsMixin, NetBoxTable):
verbose_name='VRF' verbose_name='VRF'
) )
status = columns.ChoiceFieldColumn() status = columns.ChoiceFieldColumn()
tenant = TenantColumn()
class Meta(NetBoxTable.Meta): class Meta(NetBoxTable.Meta):
model = IPAddress model = IPAddress
fields = ('address', 'vrf', 'status', 'role', 'tenant', 'tenant_group', 'description') fields = ('address', 'vrf', 'status', 'role', 'tenant', 'description')
exclude = ('id', ) exclude = ('id', )

7
netbox/ipam/tables/vlans.py
View File

@ -5,7 +5,7 @@ from django_tables2.utils import Accessor
from dcim.models import Interface from dcim.models import Interface
from ipam.models import * from ipam.models import *
from netbox.tables import NetBoxTable, columns from netbox.tables import NetBoxTable, columns
from tenancy.tables import TenancyColumnsMixin from tenancy.tables import TenancyColumnsMixin, TenantColumn
from virtualization.models import VMInterface from virtualization.models import VMInterface
__all__ = ( __all__ = (
@ -173,7 +173,7 @@ class VLANVirtualMachinesTable(VLANMembersTable):
exclude = ('id', ) exclude = ('id', )
class InterfaceVLANTable(TenancyColumnsMixin, NetBoxTable): class InterfaceVLANTable(NetBoxTable):
""" """
List VLANs assigned to a specific Interface. List VLANs assigned to a specific Interface.
""" """
@ -189,6 +189,7 @@ class InterfaceVLANTable(TenancyColumnsMixin, NetBoxTable):
accessor=Accessor('group__name'), accessor=Accessor('group__name'),
verbose_name='Group' verbose_name='Group'
) )
tenant = TenantColumn()
status = columns.ChoiceFieldColumn() status = columns.ChoiceFieldColumn()
role = tables.Column( role = tables.Column(
linkify=True linkify=True
@ -196,7 +197,7 @@ class InterfaceVLANTable(TenancyColumnsMixin, NetBoxTable):
class Meta(NetBoxTable.Meta): class Meta(NetBoxTable.Meta):
model = VLAN 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', ) exclude = ('id', )
def __init__(self, interface, *args, **kwargs): def __init__(self, interface, *args, **kwargs):