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

Fixes #2663: Prevent duplicate interfaces from appearing under VLAN members view

Browse Source
This commit is contained in:
Jeremy Stretch
2018-12-12 13:18:42 -05:00
parent 785cdcefd6
commit 2418fed65b
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/ipam/models.py
View File

@@ -812,7 +812,7 @@ class VLAN(ChangeLoggedModel, CustomFieldModel):
return Interface.objects.filter(
Q(untagged_vlan_id=self.pk) |
Q(tagged_vlans=self.pk)
)
).distinct()
class Service(ChangeLoggedModel, CustomFieldModel):

2
netbox/ipam/tables.py
View File

@@ -430,7 +430,7 @@ class VLANDetailTable(VLANTable):
class VLANMemberTable(BaseTable):
parent = tables.LinkColumn(order_by=['device', 'virtual_machine'])
name = tables.Column(verbose_name='Interface')
name = tables.LinkColumn(verbose_name='Interface')
untagged = tables.TemplateColumn(
template_code=VLAN_MEMBER_UNTAGGED,
orderable=False