Просмотр исходного кода

Fixes #10973: Fix device links in VDC table

jeremystretch 3 лет назад
Родитель
Сommit
9774bb46ce

+ 1 - 0
docs/release-notes/version-3.4.md

@@ -11,6 +11,7 @@
 * [#10946](https://github.com/netbox-community/netbox/issues/10946) - Fix AttributeError exception when viewing a device with a primary IP and no platform assigned
 * [#10948](https://github.com/netbox-community/netbox/issues/10948) - Linkify primary IPs for VDCs
 * [#10957](https://github.com/netbox-community/netbox/issues/10957) - Add missing VDCs column to interface tables
+* [#10973](https://github.com/netbox-community/netbox/issues/10973) - Fix device links in VDC table
 * [#10980](https://github.com/netbox-community/netbox/issues/10980) - Fix view tabs for plugin objects
 
 ## v3.4-beta1 (2022-11-16)

+ 6 - 3
netbox/dcim/tables/devices.py

@@ -139,7 +139,8 @@ class PlatformTable(NetBoxTable):
 class DeviceTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable):
     name = tables.TemplateColumn(
         order_by=('_name',),
-        template_code=DEVICE_LINK
+        template_code=DEVICE_LINK,
+        linkify=True
     )
     status = columns.ChoiceFieldColumn()
     region = tables.Column(
@@ -220,7 +221,8 @@ class DeviceTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable):
 
 class DeviceImportTable(TenancyColumnsMixin, NetBoxTable):
     name = tables.TemplateColumn(
-        template_code=DEVICE_LINK
+        template_code=DEVICE_LINK,
+        linkify=True
     )
     status = columns.ChoiceFieldColumn()
     site = tables.Column(
@@ -897,7 +899,8 @@ class VirtualDeviceContextTable(TenancyColumnsMixin, NetBoxTable):
     )
     device = tables.TemplateColumn(
         order_by=('_name',),
-        template_code=DEVICE_LINK
+        template_code=DEVICE_LINK,
+        linkify=True
     )
     status = columns.ChoiceFieldColumn()
     primary_ip = tables.Column(

+ 1 - 3
netbox/dcim/tables/template_code.py

@@ -21,9 +21,7 @@ DEVICE_WEIGHT = """
 """
 
 DEVICE_LINK = """
-<a href="{% url 'dcim:device' pk=record.pk %}">
-    {{ record.name|default:'<span class="badge bg-info">Unnamed device</span>' }}
-</a>
+{{ value|default:'<span class="badge bg-info">Unnamed device</span>' }}
 """
 
 DEVICEBAY_STATUS = """