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

#9177: Use TenancyColumnsMixin (from #9686)

Browse Source
This commit is contained in:
jeremystretch 2022-07-11 16:14:46 -04:00
parent 123e758c6d
commit 8a8ada8529
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
netbox/wireless/tables/wirelesslan.py
View File

@ -2,7 +2,7 @@ import django_tables2 as tables
from dcim.models import Interface from dcim.models import Interface
from netbox.tables import NetBoxTable, columns from netbox.tables import NetBoxTable, columns
from tenancy.tables import TenantColumn from tenancy.tables import TenancyColumnsMixin
from wireless.models import * from wireless.models import *
__all__ = ( __all__ = (
@ -33,14 +33,13 @@ class WirelessLANGroupTable(NetBoxTable):
default_columns = ('pk', 'name', 'wirelesslan_count', 'description') default_columns = ('pk', 'name', 'wirelesslan_count', 'description')
class WirelessLANTable(NetBoxTable): class WirelessLANTable(TenancyColumnsMixin, NetBoxTable):
ssid = tables.Column( ssid = tables.Column(
linkify=True linkify=True
) )
group = tables.Column( group = tables.Column(
linkify=True linkify=True
) )
tenant = TenantColumn()
interface_count = tables.Column( interface_count = tables.Column(
verbose_name='Interfaces' verbose_name='Interfaces'
) )
@ -51,8 +50,8 @@ class WirelessLANTable(NetBoxTable):
class Meta(NetBoxTable.Meta): class Meta(NetBoxTable.Meta):
model = WirelessLAN model = WirelessLAN
fields = ( fields = (
'pk', 'ssid', 'group', 'tenant', 'description', 'vlan', 'interface_count', 'auth_type', 'auth_cipher', 'pk', 'ssid', 'group', 'tenant', 'tenant_group', 'description', 'vlan', 'interface_count', 'auth_type',
'auth_psk', 'tags', 'created', 'last_updated', 'auth_cipher', 'auth_psk', 'tags', 'created', 'last_updated',
) )
default_columns = ('pk', 'ssid', 'group', 'description', 'vlan', 'auth_type', 'interface_count') default_columns = ('pk', 'ssid', 'group', 'description', 'vlan', 'auth_type', 'interface_count')

9
netbox/wireless/tables/wirelesslink.py
View File

@ -1,7 +1,7 @@
import django_tables2 as tables import django_tables2 as tables
from netbox.tables import NetBoxTable, columns from netbox.tables import NetBoxTable, columns
from tenancy.tables import TenantColumn from tenancy.tables import TenancyColumnsMixin
from wireless.models import * from wireless.models import *
__all__ = ( __all__ = (
@ -9,7 +9,7 @@ __all__ = (
) )
class WirelessLinkTable(NetBoxTable): class WirelessLinkTable(TenancyColumnsMixin, NetBoxTable):
id = tables.Column( id = tables.Column(
linkify=True, linkify=True,
verbose_name='ID' verbose_name='ID'
@ -29,7 +29,6 @@ class WirelessLinkTable(NetBoxTable):
interface_b = tables.Column( interface_b = tables.Column(
linkify=True linkify=True
) )
tenant = TenantColumn()
tags = columns.TagColumn( tags = columns.TagColumn(
url_name='wireless:wirelesslink_list' url_name='wireless:wirelesslink_list'
) )
@ -37,8 +36,8 @@ class WirelessLinkTable(NetBoxTable):
class Meta(NetBoxTable.Meta): class Meta(NetBoxTable.Meta):
model = WirelessLink model = WirelessLink
fields = ( fields = (
'pk', 'id', 'status', 'device_a', 'interface_a', 'device_b', 'interface_b', 'ssid', 'tenant', 'description', 'pk', 'id', 'status', 'device_a', 'interface_a', 'device_b', 'interface_b', 'ssid', 'tenant',
'auth_type', 'auth_cipher', 'auth_psk', 'tags', 'created', 'last_updated', 'tenant_group', 'description', 'auth_type', 'auth_cipher', 'auth_psk', 'tags', 'created', 'last_updated',
) )
default_columns = ( default_columns = (
'pk', 'id', 'status', 'device_a', 'interface_a', 'device_b', 'interface_b', 'ssid', 'auth_type', 'pk', 'id', 'status', 'device_a', 'interface_a', 'device_b', 'interface_b', 'ssid', 'auth_type',