From 57b225b6807e49ecef6014fae20c36c0c2443eb6 Mon Sep 17 00:00:00 2001 From: John Anderson Date: Sat, 15 Sep 2018 17:23:58 -0400 Subject: [PATCH] fixes #2423 - interface connection links --- netbox/dcim/tables.py | 6 ++++-- netbox/templates/dcim/inc/interface.html | 2 +- netbox/templates/dcim/interface.html | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index fc9105774..2630a9ba2 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -614,10 +614,12 @@ class PowerConnectionTable(BaseTable): class InterfaceConnectionTable(BaseTable): device_a = tables.LinkColumn('dcim:device', accessor=Accessor('interface_a.device'), args=[Accessor('interface_a.device.pk')], verbose_name='Device A') - interface_a = tables.Column(verbose_name='Interface A') + interface_a = tables.LinkColumn('dcim:interface', accessor=Accessor('interface_a'), + args=[Accessor('interface_a.pk')], verbose_name='Interface A') device_b = tables.LinkColumn('dcim:device', accessor=Accessor('interface_b.device'), args=[Accessor('interface_b.device.pk')], verbose_name='Device B') - interface_b = tables.Column(verbose_name='Interface B') + interface_b = tables.LinkColumn('dcim:interface', accessor=Accessor('interface_b'), + args=[Accessor('interface_b.pk')], verbose_name='Interface B') class Meta(BaseTable.Meta): model = InterfaceConnection diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html index 44da7cbc2..229f6f2eb 100644 --- a/netbox/templates/dcim/inc/interface.html +++ b/netbox/templates/dcim/inc/interface.html @@ -44,7 +44,7 @@ {{ connected_iface.device }} - {{ connected_iface }} + {{ connected_iface }} {% endwith %} {% elif iface.circuit_termination %} diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html index f82f81baf..47278d468 100644 --- a/netbox/templates/dcim/interface.html +++ b/netbox/templates/dcim/interface.html @@ -134,7 +134,9 @@ Name - {{ connected_interface.name }} + + {{ connected_interface.name }} + Type