From a313b675a687fab7c13e889e58a55c662aee531c Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Mon, 5 Apr 2021 15:24:57 -0400 Subject: [PATCH] Simplify CircuitTermination display in circuits table --- netbox/circuits/tables.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/netbox/circuits/tables.py b/netbox/circuits/tables.py index ba599757a..41a3aed7f 100644 --- a/netbox/circuits/tables.py +++ b/netbox/circuits/tables.py @@ -6,6 +6,15 @@ from utilities.tables import BaseTable, ButtonsColumn, ChoiceFieldColumn, TagCol from .models import * +CIRCUITTERMINATION_LINK = """ +{% if value.site %} + {{ value.site }} +{% elif value.provider_network %} + {{ value.provider_network }} +{% endif %} +""" + + # # Providers # @@ -88,12 +97,12 @@ class CircuitTable(BaseTable): ) status = ChoiceFieldColumn() tenant = TenantColumn() - termination_a = tables.Column( - linkify=True, + termination_a = tables.TemplateColumn( + template_code=CIRCUITTERMINATION_LINK, verbose_name='Side A' ) - termination_z = tables.Column( - linkify=True, + termination_z = tables.TemplateColumn( + template_code=CIRCUITTERMINATION_LINK, verbose_name='Side Z' ) tags = TagColumn(