From 04fb92fa9875a7cfb47d24747f4bfad8505fa022 Mon Sep 17 00:00:00 2001 From: Brian Tiemann Date: Mon, 28 Oct 2024 15:37:54 -0400 Subject: [PATCH] Define vlan_translation_table conditionally --- netbox/dcim/views.py | 10 ++++++---- netbox/virtualization/views.py | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 332af15a9..495e3f5de 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -2579,10 +2579,12 @@ class InterfaceView(generic.ObjectView): data=vlans, orderable=False ) - vlan_translation_table = VLANTranslationRuleTable( - data=instance.vlan_translation_policy.rules.all() if instance.vlan_translation_policy else [], - orderable=False - ) + vlan_translation_table = None + if instance.vlan_translation_policy: + vlan_translation_table = VLANTranslationRuleTable( + data=instance.vlan_translation_policy.rules.all(), + orderable=False + ) return { 'vdc_table': vdc_table, diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py index caeaead1f..30b59b2af 100644 --- a/netbox/virtualization/views.py +++ b/netbox/virtualization/views.py @@ -515,10 +515,12 @@ class VMInterfaceView(generic.ObjectView): exclude=('virtual_machine',), orderable=False ) - vlan_translation_table = VLANTranslationRuleTable( - data=instance.vlan_translation_policy.rules.all() if instance.vlan_translation_policy else [], - orderable=False - ) + vlan_translation_table = None + if instance.vlan_translation_policy: + vlan_translation_table = VLANTranslationRuleTable( + data=instance.vlan_translation_policy.rules.all(), + orderable=False + ) # Get assigned VLANs and annotate whether each is tagged or untagged vlans = []