mirror of
https://github.com/netbox-community/netbox.git
synced 2024-05-10 07:54:54 +00:00
#6454 fix merge conflicts
This commit is contained in:
@ -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
|
||||
|
Reference in New Issue
Block a user