NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-22 20:12:00 -06:00
Code Issues Actions 8 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 netbox.tables import NetBoxTable, columns
from tenancy.tables import TenantColumn
from tenancy.tables import TenancyColumnsMixin
from wireless.models import *
__all__ = (
@ -33,14 +33,13 @@ class WirelessLANGroupTable(NetBoxTable):
default_columns = ('pk', 'name', 'wirelesslan_count', 'description')
class WirelessLANTable(NetBoxTable):
class WirelessLANTable(TenancyColumnsMixin, NetBoxTable):
ssid = tables.Column(
linkify=True
)
group = tables.Column(
linkify=True
)
tenant = TenantColumn()
interface_count = tables.Column(
verbose_name='Interfaces'
)
@ -51,8 +50,8 @@ class WirelessLANTable(NetBoxTable):
class Meta(NetBoxTable.Meta):
model = WirelessLAN
fields = (
'pk', 'ssid', 'group', 'tenant', 'description', 'vlan', 'interface_count', 'auth_type', 'auth_cipher',
'auth_psk', 'tags', 'created', 'last_updated',
'pk', 'ssid', 'group', 'tenant', 'tenant_group', 'description', 'vlan', 'interface_count', 'auth_type',
'auth_cipher', 'auth_psk', 'tags', 'created', 'last_updated',
)
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
from netbox.tables import NetBoxTable, columns
from tenancy.tables import TenantColumn
from tenancy.tables import TenancyColumnsMixin
from wireless.models import *
__all__ = (
@ -9,7 +9,7 @@ __all__ = (
)
class WirelessLinkTable(NetBoxTable):
class WirelessLinkTable(TenancyColumnsMixin, NetBoxTable):
id = tables.Column(
linkify=True,
verbose_name='ID'
@ -29,7 +29,6 @@ class WirelessLinkTable(NetBoxTable):
interface_b = tables.Column(
linkify=True
)
tenant = TenantColumn()
tags = columns.TagColumn(
url_name='wireless:wirelesslink_list'
)
@ -37,8 +36,8 @@ class WirelessLinkTable(NetBoxTable):
class Meta(NetBoxTable.Meta):
model = WirelessLink
fields = (
'pk', 'id', 'status', 'device_a', 'interface_a', 'device_b', 'interface_b', 'ssid', 'tenant', 'description',
'auth_type', 'auth_cipher', 'auth_psk', 'tags', 'created', 'last_updated',
'pk', 'id', 'status', 'device_a', 'interface_a', 'device_b', 'interface_b', 'ssid', 'tenant',
'tenant_group', 'description', 'auth_type', 'auth_cipher', 'auth_psk', 'tags', 'created', 'last_updated',
)
default_columns = (
'pk', 'id', 'status', 'device_a', 'interface_a', 'device_b', 'interface_b', 'ssid', 'auth_type',