mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

#6454 fix merge conflicts

Browse Source
This commit is contained in:
Arthur
2022-08-18 15:31:54 -07:00
parent 928dff6b68 804c064a7e
commit 38a8ddcd77
458 changed files with 14069 additions and 6039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
netbox/wireless/models.py
View File

@ -102,11 +102,20 @@ class WirelessLAN(WirelessAuthenticationBase, NetBoxModel):
null=True,
verbose_name='VLAN'
)
tenant = models.ForeignKey(
to='tenancy.Tenant',
on_delete=models.PROTECT,
related_name='wireless_lans',
blank=True,
null=True
)
description = models.CharField(
max_length=200,
blank=True
)
clone_fields = ('ssid', 'group', 'tenant', 'description')
class Meta:
ordering = ('ssid', 'pk')
verbose_name = 'Wireless LAN'
@ -144,6 +153,13 @@ class WirelessLink(WirelessAuthenticationBase, NetBoxModel):
choices=LinkStatusChoices,
default=LinkStatusChoices.STATUS_CONNECTED
)
tenant = models.ForeignKey(
to='tenancy.Tenant',
on_delete=models.PROTECT,
related_name='wireless_links',
blank=True,
null=True
)
description = models.CharField(
max_length=200,
blank=True