| Name |
diff --git a/netbox/templates/dcim/cable.html b/netbox/templates/dcim/cable.html
index d68353274f..cf12ba930e 100644
--- a/netbox/templates/dcim/cable.html
+++ b/netbox/templates/dcim/cable.html
@@ -26,9 +26,9 @@
{% if object.tenant %}
{% if object.tenant.group %}
- {{ object.tenant.group }} /
+ {{ object.tenant.group|linkify }} /
{% endif %}
- {{ object.tenant }}
+ {{ object.tenant|linkify }}
{% else %}
None
{% endif %}
diff --git a/netbox/templates/dcim/cable_trace.html b/netbox/templates/dcim/cable_trace.html
index d9dbc5b2d7..ac04819252 100644
--- a/netbox/templates/dcim/cable_trace.html
+++ b/netbox/templates/dcim/cable_trace.html
@@ -25,7 +25,7 @@
{% if next_node.cable %}
{{ next_node }}
- (Cable {{ next_node.cable }})
+ (Cable {{ next_node.cable|linkify }})
{% else %}
{{ next_node }}
diff --git a/netbox/templates/dcim/consoleport.html b/netbox/templates/dcim/consoleport.html
index 08f4095578..a8934357ab 100644
--- a/netbox/templates/dcim/consoleport.html
+++ b/netbox/templates/dcim/consoleport.html
@@ -20,19 +20,11 @@
| Device |
-
- {{ object.device }}
- |
+ {{ object.device|linkify }} |
| Module |
-
- {% if object.module %}
- {{ object.module }}
- {% else %}
- {{ None|placeholder }}
- {% endif %}
- |
+ {{ object.module|linkify|placeholder }} |
| Name |
@@ -74,7 +66,7 @@
| Cable |
- {{ object.cable }}
+ {{ object.cable|linkify }}
@@ -83,9 +75,7 @@
{% if object.connected_endpoint %}
|
| Device |
-
- {{ object.connected_endpoint.device }}
- |
+ {{ object.connected_endpoint.device|linkify }} |
| Name |
diff --git a/netbox/templates/dcim/consoleserverport.html b/netbox/templates/dcim/consoleserverport.html
index 81d7734d3c..799aa57bd1 100644
--- a/netbox/templates/dcim/consoleserverport.html
+++ b/netbox/templates/dcim/consoleserverport.html
@@ -20,19 +20,11 @@
| Device |
-
- {{ object.device }}
- |
+ {{ object.device|linkify }} |
| Module |
-
- {% if object.module %}
- {{ object.module }}
- {% else %}
- {{ None|placeholder }}
- {% endif %}
- |
+ {{ object.module|linkify|placeholder }} |
| Name |
@@ -74,7 +66,7 @@
| Cable |
- {{ object.cable }}
+ {{ object.cable|linkify }}
@@ -84,7 +76,7 @@
|
| Device |
- {{ object.connected_endpoint.device }}
+ {{ object.connected_endpoint.device|linkify }}
|
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index db3a7868e9..dde8adee00 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -19,28 +19,26 @@
|
{% if object.site.region %}
{% for region in object.site.region.get_ancestors %}
- {{ region }} /
+ {{ region|linkify }} /
{% endfor %}
- {{ object.site.region }}
+ {{ object.site.region|linkify }}
{% else %}
- None
+ None
{% endif %}
|
| Site |
-
- {{ object.site }}
- |
+ {{ object.site|linkify }} |
| Location |
{% if object.location %}
{% for location in object.location.get_ancestors %}
- {{ location }} /
+ {{ location|linkify }} /
{% endfor %}
- {{ object.location }}
+ {{ object.location|linkify }}
{% else %}
None
{% endif %}
@@ -61,7 +59,7 @@
|
{% if object.parent_bay %}
{% with object.parent_bay.device as parent %}
- {{ parent }} / {{ object.parent_bay }}
+ {{ parent|linkify }} / {{ object.parent_bay }}
{% if parent.position %}
(U{{ parent.position }} / {{ parent.get_face_display }})
{% endif %}
@@ -80,9 +78,9 @@
|
{% if object.tenant %}
{% if object.tenant.group %}
- {{ object.tenant.group }} /
+ {{ object.tenant.group|linkify }} /
{% endif %}
- {{ object.tenant }}
+ {{ object.tenant|linkify }}
{% else %}
None
{% endif %}
@@ -91,7 +89,7 @@
|
| Device Type |
- {{ object.device_type }} ({{ object.device_type.u_height }}U)
+ {{ object.device_type|linkify }} ({{ object.device_type.u_height }}U)
|
@@ -127,7 +125,7 @@
{% for vc_member in vc_members %}
|
- {{ vc_member }}
+ {{ vc_member|linkify }}
|
{% badge vc_member.vc_position show_empty=True %}
@@ -173,13 +171,7 @@
|
| Platform |
-
- {% if object.platform %}
- {{ object.platform }}
- {% else %}
- None
- {% endif %}
- |
+ {{ object.platform|linkify|placeholder }} |
| Primary IPv4 |
@@ -187,9 +179,9 @@
{% if object.primary_ip4 %}
{{ object.primary_ip4.address.ip }}
{% if object.primary_ip4.nat_inside %}
- (NAT for {{ object.primary_ip4.nat_inside.address.ip }})
+ (NAT for {{ object.primary_ip4.nat_inside.address.ip|linkify }})
{% elif object.primary_ip4.nat_outside %}
- (NAT: {{ object.primary_ip4.nat_outside.address.ip }})
+ (NAT: {{ object.primary_ip4.nat_outside.address.ip|linkify }})
{% endif %}
{% else %}
—
@@ -202,9 +194,9 @@
{% if object.primary_ip6 %}
{{ object.primary_ip6.address.ip }}
{% if object.primary_ip6.nat_inside %}
- (NAT for {{ object.primary_ip6.nat_inside.address.ip }})
+ (NAT for {{ object.primary_ip6.nat_inside.address.ip|linkify }})
{% elif object.primary_ip6.nat_outside %}
- (NAT: {{ object.primary_ip6.nat_outside.address.ip }})
+ (NAT: {{ object.primary_ip6.nat_outside.address.ip|linkify }})
{% endif %}
{% else %}
—
@@ -216,9 +208,9 @@
Cluster |
{% if object.cluster.group %}
- {{ object.cluster.group }} /
+ {{ object.cluster.group|linkify }} /
{% endif %}
- {{ object.cluster }}
+ {{ object.cluster|linkify }}
|
{% endif %}
diff --git a/netbox/templates/dcim/devicebay.html b/netbox/templates/dcim/devicebay.html
index 3a470bec5a..38cc8f16ba 100644
--- a/netbox/templates/dcim/devicebay.html
+++ b/netbox/templates/dcim/devicebay.html
@@ -20,9 +20,7 @@
| Device |
-
- {{ object.device }}
- |
+ {{ object.device|linkify }} |
| Name |
@@ -54,9 +52,7 @@
| Device |
-
- {{ device }}
- |
+ {{ device|linkify }} |
| Device Type |
diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html
index 4b9dc8db7c..e717a48aae 100644
--- a/netbox/templates/dcim/devicetype.html
+++ b/netbox/templates/dcim/devicetype.html
@@ -14,7 +14,7 @@
| Manufacturer |
- {{ object.manufacturer }} |
+ {{ object.manufacturer|linkify }} |
| Model Name |
diff --git a/netbox/templates/dcim/frontport.html b/netbox/templates/dcim/frontport.html
index a8d2dd06f0..891f217eec 100644
--- a/netbox/templates/dcim/frontport.html
+++ b/netbox/templates/dcim/frontport.html
@@ -20,19 +20,11 @@
| Device |
-
- {{ object.device }}
- |
+ {{ object.device|linkify }} |
| Module |
-
- {% if object.module %}
- {{ object.module }}
- {% else %}
- {{ None|placeholder }}
- {% endif %}
- |
+ {{ object.module|linkify|placeholder }} |
| Name |
@@ -54,9 +46,7 @@
| Rear Port |
-
- {{ object.rear_port }}
- |
+ {{ object.rear_port|linkify }} |
| Rear Port Position |
@@ -88,7 +78,7 @@
| Cable |
- {{ object.cable }}
+ {{ object.cable|linkify }}
diff --git a/netbox/templates/dcim/inc/cable_termination.html b/netbox/templates/dcim/inc/cable_termination.html
index c9f3f0d4a2..f44c3b9d1d 100644
--- a/netbox/templates/dcim/inc/cable_termination.html
+++ b/netbox/templates/dcim/inc/cable_termination.html
@@ -4,51 +4,35 @@
{# Device component #}
|
| Device |
-
- {{ termination.device }}
- |
+ {{ termination.device|linkify }} |
- {% if termination.device.site %}
| Site |
-
- {{ termination.device.site }}
- |
+ {{ termination.device.site|linkify }} |
- {% endif %}
{% if termination.device.rack %}
-
- | Rack |
-
- {{ termination.device.rack }}
- |
-
+
+ | Rack |
+ {{ termination.device.rack|linkify }} |
+
{% endif %}
| Type |
-
- {{ termination|meta:"verbose_name"|capfirst }}
- |
+ {{ termination|meta:"verbose_name"|capfirst }} |
| Component |
-
- {{ termination }}
- |
+ {{ termination|linkify }} |
{% else %}
{# Circuit termination #}
| Provider |
-
- {{ termination.circuit.provider }}
- |
+ {{ termination.circuit.provider|linkify }} |
| Circuit |
-
- {{ termination.circuit }} ({{ termination }})
- |
+ {{ termination.|linkify }} ({{ termination }}) |
{% endif %}
diff --git a/netbox/templates/dcim/inc/cabletermination.html b/netbox/templates/dcim/inc/cabletermination.html
index 26a7e1cd32..c7fa7918ad 100644
--- a/netbox/templates/dcim/inc/cabletermination.html
+++ b/netbox/templates/dcim/inc/cabletermination.html
@@ -6,9 +6,9 @@
{{ termination.parent_object }}
{% else %}
- {{ termination.parent_object }}
+ {{ termination.parent_object|linkify }}
{% endif %}
- {{ termination }}
+ {{ termination|linkify }}
|
diff --git a/netbox/templates/dcim/inc/endpoint_connection.html b/netbox/templates/dcim/inc/endpoint_connection.html
index d5b9f6112a..c0167ff0f0 100644
--- a/netbox/templates/dcim/inc/endpoint_connection.html
+++ b/netbox/templates/dcim/inc/endpoint_connection.html
@@ -1,7 +1,7 @@
{% if path.destination_id %}
{% with endpoint=path.destination %}
- {{ endpoint.parent_object }} |
- {{ endpoint }} |
+ {{ endpoint.parent_object|linkify }} |
+ {{ endpoint|linkify }} |
{% endwith %}
{% else %}
Not connected |
diff --git a/netbox/templates/dcim/inc/nonracked_devices.html b/netbox/templates/dcim/inc/nonracked_devices.html
index f1b669eb98..7f4da2f243 100644
--- a/netbox/templates/dcim/inc/nonracked_devices.html
+++ b/netbox/templates/dcim/inc/nonracked_devices.html
@@ -21,7 +21,7 @@
{{ device.device_role }} |
{{ device.device_type }} |
{% if device.parent_bay %}
- {{ device.parent_bay.device }} |
+ {{ device.parent_bay.device|linkify }} |
{{ device.parent_bay }} |
{% else %}
— |
diff --git a/netbox/templates/dcim/inc/panels/inventory_items.html b/netbox/templates/dcim/inc/panels/inventory_items.html
index c65b342b29..d8ca32dbdd 100644
--- a/netbox/templates/dcim/inc/panels/inventory_items.html
+++ b/netbox/templates/dcim/inc/panels/inventory_items.html
@@ -15,19 +15,9 @@
{% for item in object.inventory_items.all %}
- |
- {{ item.name }}
- |
-
- {{ item.label|placeholder }}
- |
-
- {% if item.role %}
- {{ item.role }}
- {% else %}
- —
- {% endif %}
- |
+ {{ item.name }} |
+ {{ item.label|placeholder }} |
+ {{ item.role|linkify|placeholder }} |
{% if perms.dcim.change_inventoryitem %}
diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html
index 35121b2e30..53e2f2103a 100644
--- a/netbox/templates/dcim/interface.html
+++ b/netbox/templates/dcim/interface.html
@@ -30,19 +30,11 @@
| Device |
-
- {{ object.device }}
- |
+ {{ object.device|linkify }} |
| Module |
-
- {% if object.module %}
- {{ object.module }}
- {% else %}
- {{ None|placeholder }}
- {% endif %}
- |
+ {{ object.module|linkify|placeholder }} |
| Name |
@@ -74,33 +66,15 @@
| Parent |
-
- {% if object.parent %}
- {{ object.parent }}
- {% else %}
- None
- {% endif %}
- |
+ {{ object.parent|linkify|placeholder }} |
| Bridge |
-
- {% if object.bridge %}
- {{ object.bridge }}
- {% else %}
- None
- {% endif %}
- |
+ {{ object.bridge|linkify|placeholder }} |
| LAG |
-
- {% if object.lag%}
- {{ object.lag }}
- {% else %}
- None
- {% endif %}
- |
+ {{ object.lag|linkify|placeholder }} |
| Description |
@@ -128,13 +102,7 @@
| VRF |
-
- {% if object.vrf %}
- {{ object.vrf }}
- {% else %}
- None
- {% endif %}
- |
+ {{ object.vrf|linkify|placeholder }} |
@@ -170,7 +138,7 @@
|
| Cable |
- {{ object.cable }}
+ {{ object.cable|linkify }}
@@ -180,9 +148,7 @@
{% with iface=object.connected_endpoint %}
|
| Device |
-
- {{ iface.device }}
- |
+ {{ iface.device|linkify }} |
| Name |
@@ -196,13 +162,7 @@
| LAG |
-
- {% if iface.lag%}
- {{ iface.lag }}
- {% else %}
- None
- {% endif %}
- |
+ {{ iface.lag|linkify|placeholder }} |
| Description |
@@ -225,11 +185,11 @@
{% with ct=object.connected_endpoint %}
| Provider |
- {{ ct.circuit.provider }} |
+ {{ ct.circuit.provider|linkify }} |
| Circuit |
- {{ ct.circuit }} |
+ {{ ct.circuit|linkify }} |
| Side |
@@ -253,7 +213,7 @@
| Wireless Link |
- {{ object.wireless_link }}
+ {{ object.wireless_link|linkify }}
@@ -262,15 +222,11 @@
{% with peer_interface=object.connected_endpoint %}
|
| Device |
-
- {{ peer_interface.device }}
- |
+ {{ peer_interface.device|linkify }} |
| Name |
-
- {{ peer_interface }}
- |
+ {{ peer_interface|linkify }} |
| Type |
@@ -409,7 +365,7 @@
|
{% if wlan.group %}
- {{ wlan.group }}
+ {{ wlan.group|linkify }}
{% else %}
—
{% endif %}
@@ -443,15 +399,9 @@
|
{% for member in object.member_interfaces.all %}
- |
- {{ member.device }}
- |
-
- {{ member }}
- |
-
- {{ member.get_type_display }}
- |
+ {{ member.device|linkify }} |
+ {{ member|linkify }} |
+ {{ member.get_type_display }} |
{% empty %}
diff --git a/netbox/templates/dcim/inventoryitem.html b/netbox/templates/dcim/inventoryitem.html
index 0e30c5c8cc..b52a7457bd 100644
--- a/netbox/templates/dcim/inventoryitem.html
+++ b/netbox/templates/dcim/inventoryitem.html
@@ -18,19 +18,11 @@
| Device |
-
- {{ object.device }}
- |
+ {{ object.device|linkify }} |
| Parent Item |
-
- {% if object.parent %}
- {{ object.parent }}
- {% else %}
- —
- {% endif %}
- |
+ {{ object.parent|linkify|placeholder }} |
| Name |
@@ -42,33 +34,15 @@
| Role |
-
- {% if object.role %}
- {{ object.role }}
- {% else %}
- —
- {% endif %}
- |
+ {{ object.role|linkify|placeholder }} |
| Component |
-
- {% if object.component %}
- {{ object.component }}
- {% else %}
- —
- {% endif %}
- |
+ {{ object.component|linkify|placeholder }} |
| Manufacturer |
-
- {% if object.manufacturer %}
- {{ object.manufacturer }}
- {% else %}
- —
- {% endif %}
- |
+ {{ object.manufacturer|linkify|placeholder }} |
| Part ID |
diff --git a/netbox/templates/dcim/location.html b/netbox/templates/dcim/location.html
index 43bbfd114e..ca48797d04 100644
--- a/netbox/templates/dcim/location.html
+++ b/netbox/templates/dcim/location.html
@@ -6,7 +6,7 @@
{% block breadcrumbs %}
{{ block.super }}
{% for location in object.get_ancestors %}
- {{ location }}
+ {{ location|linkify }}
{% endfor %}
{% endblock %}
@@ -37,26 +37,20 @@
| Site |
- {{ object.site }} |
+ {{ object.site|linkify }} |
| Parent |
-
- {% if object.parent %}
- {{ object.parent }}
- {% else %}
- —
- {% endif %}
- |
+ {{ object.parent|linkify|placeholder }} |
| Tenant |
{% if object.tenant %}
{% if object.tenant.group %}
- {{ object.tenant.group }} /
+ {{ object.tenant.group|linkify }} /
{% endif %}
- {{ object.tenant }}
+ {{ object.tenant|linkify }}
{% else %}
None
{% endif %}
diff --git a/netbox/templates/dcim/module.html b/netbox/templates/dcim/module.html
index 4a6b7d097e..632e37c2cd 100644
--- a/netbox/templates/dcim/module.html
+++ b/netbox/templates/dcim/module.html
@@ -19,21 +19,15 @@
| Device |
-
- {{ object.device }}
- |
+ {{ object.device|linkify }} |
| Device Type |
-
- {{ object.device.device_type }}
- |
+ {{ object.device.device_type|linkify }} |
| Module Type |
-
- {{ object.module_type }}
- |
+ {{ object.module_type|linkify }} |
| Serial Number |
diff --git a/netbox/templates/dcim/modulebay.html b/netbox/templates/dcim/modulebay.html
index f4d56e5f26..a12e020e9a 100644
--- a/netbox/templates/dcim/modulebay.html
+++ b/netbox/templates/dcim/modulebay.html
@@ -54,15 +54,11 @@
{% endwith %}
diff --git a/netbox/templates/dcim/moduletype.html b/netbox/templates/dcim/moduletype.html
index 5d9aef9408..59d1139bee 100644
--- a/netbox/templates/dcim/moduletype.html
+++ b/netbox/templates/dcim/moduletype.html
@@ -12,7 +12,7 @@
| Manufacturer |
- {{ object.manufacturer }} |
+ {{ object.manufacturer|linkify }} |
| Model Name |
diff --git a/netbox/templates/dcim/platform.html b/netbox/templates/dcim/platform.html
index 5180d47c5d..8d1e3797ae 100644
--- a/netbox/templates/dcim/platform.html
+++ b/netbox/templates/dcim/platform.html
@@ -37,13 +37,7 @@
| Manufacturer |
-
- {% if object.manufacturer %}
- {{ object.manufacturer }}
- {% else %}
- None
- {% endif %}
- |
+ {{ object.manufacturer|linkify|placeholder }} |
| NAPALM Driver |
diff --git a/netbox/templates/dcim/powerfeed.html b/netbox/templates/dcim/powerfeed.html
index 5157a5ec06..18945c0a0e 100644
--- a/netbox/templates/dcim/powerfeed.html
+++ b/netbox/templates/dcim/powerfeed.html
@@ -24,19 +24,11 @@
| Power Panel |
-
- {{ object.power_panel }}
- |
+ {{ object.power_panel|linkify }} |
| Rack |
-
- {% if object.rack %}
- {{ object.rack }}
- {% else %}
- None
- {% endif %}
- |
+ {{ object.rack|linkify|placeholder }} |
| Type |
@@ -50,7 +42,7 @@
Connected Device |
{% if object.connected_endpoint %}
- {{ object.connected_endpoint.device }} ({{ object.connected_endpoint }})
+ {{ object.connected_endpoint.device|linkify }} ({{ object.connected_endpoint }})
{% else %}
None
{% endif %}
@@ -122,7 +114,7 @@
|
| Cable |
- {{ object.cable }}
+ {{ object.cable|linkify }}
@@ -131,9 +123,7 @@
{% if object.connected_endpoint %}
|
| Device |
-
- {{ object.connected_endpoint.device }}
- |
+ {{ object.connected_endpoint.device|linkify }} |
| Name |
diff --git a/netbox/templates/dcim/poweroutlet.html b/netbox/templates/dcim/poweroutlet.html
index 1410c3c549..3900d174a6 100644
--- a/netbox/templates/dcim/poweroutlet.html
+++ b/netbox/templates/dcim/poweroutlet.html
@@ -20,19 +20,11 @@
| Device |
-
- {{ object.device }}
- |
+ {{ object.device|linkify }} |
| Module |
-
- {% if object.module %}
- {{ object.module }}
- {% else %}
- {{ None|placeholder }}
- {% endif %}
- |
+ {{ object.module|linkify|placeholder }} |
| Name |
@@ -80,7 +72,7 @@
| Cable |
- {{ object.cable }}
+ {{ object.cable|linkify }}
@@ -89,9 +81,7 @@
{% if object.connected_endpoint %}
|
| Device |
-
- {{ object.connected_endpoint.device }}
- |
+ {{ object.connected_endpoint.device|linkify }} |
| Name |
diff --git a/netbox/templates/dcim/powerpanel.html b/netbox/templates/dcim/powerpanel.html
index 02db0e56fb..b7fe8eb395 100644
--- a/netbox/templates/dcim/powerpanel.html
+++ b/netbox/templates/dcim/powerpanel.html
@@ -7,7 +7,7 @@
{{ block.super }}
{{ object.site }}
{% if object.location %}
- {{ object.location }}
+ {{ object.location|linkify }}
{% endif %}
{% endblock %}
@@ -22,19 +22,11 @@
| Site |
-
- {{ object.site }}
- |
+ {{ object.site|linkify }} |
| Location |
-
- {% if object.location %}
- {{ object.location }}
- {% else %}
- None
- {% endif %}
- |
+ {{ object.location|linkify|placeholder }} |
diff --git a/netbox/templates/dcim/powerport.html b/netbox/templates/dcim/powerport.html
index f82eb14449..a542b3591b 100644
--- a/netbox/templates/dcim/powerport.html
+++ b/netbox/templates/dcim/powerport.html
@@ -20,19 +20,11 @@
| Device |
-
- {{ object.device }}
- |
+ {{ object.device|linkify }} |
| Module |
-
- {% if object.module %}
- {{ object.module }}
- {% else %}
- {{ None|placeholder }}
- {% endif %}
- |
+ {{ object.module|linkify|placeholder }} |
| Name |
@@ -80,7 +72,7 @@
| Cable |
- {{ object.cable }}
+ {{ object.cable|linkify }}
@@ -89,9 +81,7 @@
{% if object.connected_endpoint %}
|
| Device |
-
- {{ object.connected_endpoint.device }}
- |
+ {{ object.connected_endpoint.device|linkify }} |
| Name |
diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html
index aa8d3a94f0..8b4034beaa 100644
--- a/netbox/templates/dcim/rack.html
+++ b/netbox/templates/dcim/rack.html
@@ -39,9 +39,9 @@
Site |
{% if object.site.region %}
- {{ object.site.region }} /
+ {{ object.site.region|linkify }} /
{% endif %}
- {{ object.site }}
+ {{ object.site|linkify }}
|
@@ -49,9 +49,9 @@
|
{% if object.location %}
{% for location in object.location.get_ancestors %}
- {{ location }} /
+ {{ location|linkify }} /
{% endfor %}
- {{ object.location }}
+ {{ object.location|linkify }}
{% else %}
None
{% endif %}
@@ -66,9 +66,9 @@
|
{% if object.tenant %}
{% if object.tenant.group %}
- {{ object.tenant.group }} /
+ {{ object.tenant.group|linkify }}/
{% endif %}
- {{ object.tenant }}
+ {{ object|linkify }}
{% else %}
None
{% endif %}
@@ -80,13 +80,7 @@
|
| Role |
-
- {% if object.role %}
- {{ object.role }}
- {% else %}
- None
- {% endif %}
- |
+ {{ object.role|linkify|placeholder }} |
| Serial Number |
@@ -179,18 +173,10 @@
{% for powerfeed in power_feeds %}
- |
- {{ powerfeed.power_panel.name }}
-
- |
- {{ powerfeed.name }}
- |
-
- {% badge powerfeed.get_status_display bg_color=powerfeed.get_status_color %}
- |
-
- {% badge powerfeed.get_type_display bg_color=powerfeed.get_type_color %}
- |
+ {{ powerfeed.power_panel|linkify }} |
+ {{ powerfeed|linkify }} |
+ {% badge powerfeed.get_status_display bg_color=powerfeed.get_status_color %} |
+ {% badge powerfeed.get_type_display bg_color=powerfeed.get_type_color %} |
{% with power_port=powerfeed.connected_endpoint %}
{% if power_port %}
{% utilization_graph power_port.get_power_draw.allocated|percentage:powerfeed.available_power %} |
@@ -223,13 +209,7 @@
{{ resv.unit_list }}
|
-
- {% if resv.tenant %}
- {{ resv.tenant }}
- {% else %}
- None
- {% endif %}
- |
+ {{ resv.tenant|linkify|placeholder }} |
{{ resv.description }}
{{ resv.user }} · {{ resv.created|annotated_date }}
diff --git a/netbox/templates/dcim/rackreservation.html b/netbox/templates/dcim/rackreservation.html
index 1e16af6753..1464cc00c5 100644
--- a/netbox/templates/dcim/rackreservation.html
+++ b/netbox/templates/dcim/rackreservation.html
@@ -24,26 +24,18 @@
| Site |
{% if rack.site.region %}
- {{ rack.site.region }} /
+ {{ rack.site.region|linkify }} /
{% endif %}
- {{ rack.site }}
+ {{ rack.site|linkify }}
|
| Location |
-
- {% if rack.location %}
- {{ rack.location }}
- {% else %}
- None
- {% endif %}
- |
+ {{ rack.location|linkify|placeholder }} |
| Rack |
-
- {{ rack }}
- |
+ {{ rack|linkify }} |
{% endwith %}
@@ -64,9 +56,9 @@
{% if object.tenant %}
{% if object.tenant.group %}
- {{ object.tenant.group }} /
+ {{ object.tenant.group|linkify }} /
{% endif %}
- {{ object.tenant }}
+ {{ object.tenant|linkify }}
{% else %}
None
{% endif %}
diff --git a/netbox/templates/dcim/rearport.html b/netbox/templates/dcim/rearport.html
index 3be2510d57..3cdccbd7c3 100644
--- a/netbox/templates/dcim/rearport.html
+++ b/netbox/templates/dcim/rearport.html
@@ -20,19 +20,11 @@
| Device |
-
- {{ object.device }}
- |
+ {{ object.device|linkify }} |
| Module |
-
- {% if object.module %}
- {{ object.module }}
- {% else %}
- {{ None|placeholder }}
- {% endif %}
- |
+ {{ object.module|linkify|placeholder }} |
| Name |
@@ -82,7 +74,7 @@
| Cable |
- {{ object.cable }}
+ {{ object.cable|linkify }}
diff --git a/netbox/templates/dcim/region.html b/netbox/templates/dcim/region.html
index 10ecb9ea68..8a548dd4ae 100644
--- a/netbox/templates/dcim/region.html
+++ b/netbox/templates/dcim/region.html
@@ -37,13 +37,7 @@
|
| Parent |
-
- {% if object.parent %}
- {{ object.parent }}
- {% else %}
- —
- {% endif %}
- |
+ {{ object.parent|linkify|placeholder }} |
| Sites |
diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html
index 41255b4a02..acd4756d1f 100644
--- a/netbox/templates/dcim/site.html
+++ b/netbox/templates/dcim/site.html
@@ -30,9 +30,9 @@
{% if object.region %}
{% for region in object.region.get_ancestors %}
- {{ region }} /
+ {{ region|linkify }} /
{% endfor %}
- {{ object.region }}
+ {{ object.region|linkify }}
{% else %}
None
{% endif %}
@@ -43,9 +43,9 @@
|
{% if object.group %}
{% for group in object.group.get_ancestors %}
- {{ group }} /
+ {{ group|linkify }} /
{% endfor %}
- {{ object.group }}
+ {{ object.group|linkify }}
{% else %}
None
{% endif %}
@@ -60,9 +60,9 @@
|
{% if object.tenant %}
{% if object.tenant.group %}
- {{ object.tenant.group }} /
+ {{ object.tenant.group|linkify }} /
{% endif %}
- {{ object.tenant }}
+ {{ object.tenant|linkify }}
{% else %}
None
{% endif %}
@@ -242,7 +242,7 @@
|
|
{% for i in location.level|as_range %}{% endfor %}
- {{ location }}
+ {{ location|linkify }}
|
{{ location.rack_count }}
@@ -281,7 +281,7 @@
|
{% for asn in asns %}
- | {{ asn }} |
+ {{ asn|linkify }} |
{{ asn.description|placeholder }} |
{% endfor %}
diff --git a/netbox/templates/dcim/sitegroup.html b/netbox/templates/dcim/sitegroup.html
index 49f91b812a..3962711478 100644
--- a/netbox/templates/dcim/sitegroup.html
+++ b/netbox/templates/dcim/sitegroup.html
@@ -37,13 +37,7 @@
| Parent |
-
- {% if object.parent %}
- {{ object.parent }}
- {% else %}
- —
- {% endif %}
- |
+ {{ object.parent|linkify|placeholder }} |
| Sites |
diff --git a/netbox/templates/dcim/trace/circuit.html b/netbox/templates/dcim/trace/circuit.html
index 70e191dd29..3300992351 100644
--- a/netbox/templates/dcim/trace/circuit.html
+++ b/netbox/templates/dcim/trace/circuit.html
@@ -1,5 +1,5 @@
diff --git a/netbox/templates/dcim/trace/device.html b/netbox/templates/dcim/trace/device.html
index b1d37b76c9..30d1d7149c 100644
--- a/netbox/templates/dcim/trace/device.html
+++ b/netbox/templates/dcim/trace/device.html
@@ -1,11 +1,11 @@
diff --git a/netbox/templates/dcim/trace/object.html b/netbox/templates/dcim/trace/object.html
index 72e5b57871..fe9fe002be 100644
--- a/netbox/templates/dcim/trace/object.html
+++ b/netbox/templates/dcim/trace/object.html
@@ -1,3 +1,3 @@
diff --git a/netbox/templates/dcim/trace/powerpanel.html b/netbox/templates/dcim/trace/powerpanel.html
index f5b6230a79..d89b408fbc 100644
--- a/netbox/templates/dcim/trace/powerpanel.html
+++ b/netbox/templates/dcim/trace/powerpanel.html
@@ -1,5 +1,5 @@
diff --git a/netbox/templates/dcim/trace/termination.html b/netbox/templates/dcim/trace/termination.html
index f2dbca87fd..3a2dbded2e 100644
--- a/netbox/templates/dcim/trace/termination.html
+++ b/netbox/templates/dcim/trace/termination.html
@@ -1,6 +1,6 @@
{% load helpers %}
- {{ termination }}
+ {{ termination|linkify }}
{{ termination|meta:"verbose_name"|bettertitle }}
{% if termination.type %}
{{ termination.get_type_display }}
diff --git a/netbox/templates/dcim/virtualchassis.html b/netbox/templates/dcim/virtualchassis.html
index 2e1344f71d..4683b775bf 100644
--- a/netbox/templates/dcim/virtualchassis.html
+++ b/netbox/templates/dcim/virtualchassis.html
@@ -27,13 +27,7 @@
| Master |
-
- {% if object.master %}
- {{ object.master }}
- {% else %}
- —
- {% endif %}
- |
+ {{ object.master|linkify }} |
@@ -58,7 +52,7 @@
{% for vc_member in members %}
|
|
- {{ vc_member }}
+ {{ vc_member|linkify }}
|
{% badge vc_member.vc_position show_empty=True %}
diff --git a/netbox/templates/dcim/virtualchassis_edit.html b/netbox/templates/dcim/virtualchassis_edit.html
index a37ff102a2..327f205314 100644
--- a/netbox/templates/dcim/virtualchassis_edit.html
+++ b/netbox/templates/dcim/virtualchassis_edit.html
@@ -51,9 +51,7 @@
{% endfor %}
{% with device=form.instance virtual_chassis=vc_form.instance %}
|
- |
- {{ device }}
- |
+ {{ device|linkify }} |
{{ device.pk }} |
{% if device.rack %}
diff --git a/netbox/templates/extras/configcontext.html b/netbox/templates/extras/configcontext.html
index 3a9cc2e0cd..56ec52c078 100644
--- a/netbox/templates/extras/configcontext.html
+++ b/netbox/templates/extras/configcontext.html
@@ -56,7 +56,7 @@
|
{% for object in objects %}
- - {{ object }}
+ - {{ object|linkify }}
{% empty %}
- None
{% endfor %}
diff --git a/netbox/templates/extras/imageattachment_edit.html b/netbox/templates/extras/imageattachment_edit.html
index c841b97973..75b2ce48b6 100644
--- a/netbox/templates/extras/imageattachment_edit.html
+++ b/netbox/templates/extras/imageattachment_edit.html
@@ -10,7 +10,7 @@
diff --git a/netbox/templates/extras/journalentry.html b/netbox/templates/extras/journalentry.html
index 4a38fb4e34..6d1d9599c8 100644
--- a/netbox/templates/extras/journalentry.html
+++ b/netbox/templates/extras/journalentry.html
@@ -18,21 +18,15 @@
| Object |
-
- {{ object.assigned_object }}
- |
+ {{ object.assigned_object|linkify }} |
| Created |
-
- {{ object.created|annotated_date }}
- |
+ {{ object.created|annotated_date }} |
| Created By |
-
- {{ object.created_by }}
- |
+ {{ object.created_by }} |
| Kind |
diff --git a/netbox/templates/inc/panels/contacts.html b/netbox/templates/inc/panels/contacts.html
index e3e5cf4838..26961f04ae 100644
--- a/netbox/templates/inc/panels/contacts.html
+++ b/netbox/templates/inc/panels/contacts.html
@@ -14,9 +14,7 @@
{% for contact in contacts %}
- |
- {{ contact.contact }}
- |
+ {{ contact.contact|linkify }} |
{{ contact.role|placeholder }} |
{{ contact.get_priority_display|placeholder }} |
diff --git a/netbox/templates/inc/panels/custom_fields.html b/netbox/templates/inc/panels/custom_fields.html
index 88a4660f24..e0c7076ca7 100644
--- a/netbox/templates/inc/panels/custom_fields.html
+++ b/netbox/templates/inc/panels/custom_fields.html
@@ -27,11 +27,11 @@
{% elif field.type == 'multiselect' and value %}
{{ value|join:", " }}
{% elif field.type == 'object' and value %}
- {{ value }}
+ {{ value|linkify }}
{% elif field.type == 'multiobject' and value %}
{% for obj in value %}
- - {{ obj }}
+ - {{ obj|linkify }}
{% endfor %}
{% elif value %}
diff --git a/netbox/templates/ipam/aggregate.html b/netbox/templates/ipam/aggregate.html
index 9f657c9115..2ec12284e9 100644
--- a/netbox/templates/ipam/aggregate.html
+++ b/netbox/templates/ipam/aggregate.html
@@ -31,9 +31,9 @@
|
{% if object.tenant %}
{% if prefix.object.group %}
- {{ object.tenant.group }} /
+ {{ object.tenant.group|linkify }} /
{% endif %}
- {{ object.tenant }}
+ {{ object.tenant|linkify }}
{% else %}
None
{% endif %}
diff --git a/netbox/templates/ipam/asn.html b/netbox/templates/ipam/asn.html
index 4a1ecda0dc..35cfa5e64e 100644
--- a/netbox/templates/ipam/asn.html
+++ b/netbox/templates/ipam/asn.html
@@ -30,10 +30,10 @@
| Tenant |
{% if object.tenant %}
- {% if prefix.object.group %}
- {{ object.tenant.group }} /
+ {% if object.tenant.group %}
+ {{ object.tenant.group|linkify }} /
{% endif %}
- {{ object.tenant }}
+ {{ object.tenant|linkify }}
{% else %}
None
{% endif %}
diff --git a/netbox/templates/ipam/inc/panels/fhrp_groups.html b/netbox/templates/ipam/inc/panels/fhrp_groups.html
index 6583694ef8..63397a6f55 100644
--- a/netbox/templates/ipam/inc/panels/fhrp_groups.html
+++ b/netbox/templates/ipam/inc/panels/fhrp_groups.html
@@ -24,7 +24,7 @@
|
{% for ipaddress in assignment.group.ip_addresses.all %}
- {{ ipaddress }}
+ {{ ipaddress|linkify }}
{% if not forloop.last %} {% endif %}
{% endfor %}
|
diff --git a/netbox/templates/ipam/ipaddress.html b/netbox/templates/ipam/ipaddress.html
index 779d211f5d..05ce7b22dc 100644
--- a/netbox/templates/ipam/ipaddress.html
+++ b/netbox/templates/ipam/ipaddress.html
@@ -38,9 +38,9 @@
{% if object.tenant %}
{% if object.tenant.group %}
- {{ object.tenant.group }} /
+ {{ object.tenant.group|linkify }} /
{% endif %}
- {{ object.tenant }}
+ {{ object.tenant|linkify }}
{% else %}
None
{% endif %}
@@ -73,9 +73,9 @@
|
{% if object.assigned_object %}
{% if object.assigned_object.parent_object %}
- {{ object.assigned_object.parent_object }} /
+ {{ object.assigned_object.parent_object|linkify }} /
{% endif %}
- {{ object.assigned_object }}
+ {{ object.assigned_object|linkify }}
{% else %}
—
{% endif %}
@@ -85,9 +85,9 @@
| NAT (inside) |
{% if object.nat_inside %}
- {{ object.nat_inside }}
+ {{ object.nat_inside|linkify }}
{% if object.nat_inside.assigned_object %}
- ({{ object.nat_inside.assigned_object.parent_object }})
+ ({{ object.nat_inside.assigned_object.parent_object|linkify }})
{% endif %}
{% else %}
None
@@ -96,13 +96,7 @@
|
| NAT (outside) |
-
- {% if object.nat_outside %}
- {{ object.nat_outside }}
- {% else %}
- None
- {% endif %}
- |
+ {{ object.nat_outside|linkify|placeholder }} |
diff --git a/netbox/templates/ipam/iprange.html b/netbox/templates/ipam/iprange.html
index e4f27d68c7..6e27227e5d 100644
--- a/netbox/templates/ipam/iprange.html
+++ b/netbox/templates/ipam/iprange.html
@@ -37,7 +37,7 @@
VRF |
{% if object.vrf %}
- {{ object.vrf }} ({{ object.vrf.rd }})
+ {{ object.vrf|linkify }} ({{ object.vrf.rd }})
{% else %}
Global
{% endif %}
@@ -45,13 +45,7 @@
| |
| Role |
-
- {% if object.role %}
- {{ object.role }}
- {% else %}
- None
- {% endif %}
- |
+ {{ object.role|linkify|placeholder }} |
| Status |
@@ -62,9 +56,9 @@
{% if object.tenant %}
{% if object.tenant.group %}
- {{ object.tenant.group }} /
+ {{ object.tenant.group|linkify }} /
{% endif %}
- {{ object.tenant }}
+ {{ object.tenant|linkify }}
{% else %}
None
{% endif %}
diff --git a/netbox/templates/ipam/prefix.html b/netbox/templates/ipam/prefix.html
index ba3e849113..0c86fa1965 100644
--- a/netbox/templates/ipam/prefix.html
+++ b/netbox/templates/ipam/prefix.html
@@ -29,9 +29,9 @@
|
{% if object.tenant %}
{% if object.tenant.group %}
- {{ object.tenant.group }} /
+ {{ object.tenant.group|linkify }} /
{% endif %}
- {{ object.tenant }}
+ {{ object.tenant|linkify }}
{% else %}
None
{% endif %}
@@ -52,9 +52,9 @@
|
{% if object.site %}
{% if object.site.region %}
- {{ object.site.region }} /
+ {{ object.site.region|linkify }} /
{% endif %}
- {{ object.site }}
+ {{ object.site|linkify }}
{% else %}
None
{% endif %}
@@ -65,9 +65,9 @@
|
{% if object.vlan %}
{% if object.vlan.group %}
- {{ object.vlan.group }} /
+ {{ object.vlan.group|linkify }} /
{% endif %}
- {{ object.vlan }}
+ {{ object.vlan|linkify }}
{% else %}
None
{% endif %}
@@ -79,13 +79,7 @@
|
| Role |
-
- {% if object.role %}
- {{ object.role }}
- {% else %}
- None
- {% endif %}
- |
+ {{ object.role|linkify|placeholder }} |
| Description |
diff --git a/netbox/templates/ipam/routetarget.html b/netbox/templates/ipam/routetarget.html
index 71d6f9601c..e093aee61a 100644
--- a/netbox/templates/ipam/routetarget.html
+++ b/netbox/templates/ipam/routetarget.html
@@ -15,13 +15,7 @@
| Tenant |
-
- {% if object.tenant %}
- {{ object.tenant }}
- {% else %}
- None
- {% endif %}
- |
+ {{ object.tenant|linkify|placeholder }} |
| Description |
diff --git a/netbox/templates/ipam/service.html b/netbox/templates/ipam/service.html
index 5a47e44f0e..71ea20fa59 100644
--- a/netbox/templates/ipam/service.html
+++ b/netbox/templates/ipam/service.html
@@ -28,9 +28,7 @@
| Parent |
-
- {{ object.parent }}
- |
+ {{ object.parent|linkify }} |
| Protocol |
@@ -44,7 +42,7 @@
IP Addresses |
{% for ipaddress in object.ipaddresses.all %}
- {{ ipaddress }}
+ {{ ipaddress|linkify }}
{% empty %}
None
{% endfor %}
diff --git a/netbox/templates/ipam/vlan.html b/netbox/templates/ipam/vlan.html
index dc19bd34ef..ceb291cfee 100644
--- a/netbox/templates/ipam/vlan.html
+++ b/netbox/templates/ipam/vlan.html
@@ -17,9 +17,9 @@
|
{% if object.site %}
{% if object.site.region %}
- {{ object.site.region }} /
+ {{ object.site.region|linkify }} /
{% endif %}
- {{ object.site }}
+ {{ object.site|linkify }}
{% else %}
None
{% endif %}
@@ -27,13 +27,7 @@
|
| Group |
-
- {% if object.group %}
- {{ object.group }}
- {% else %}
- None
- {% endif %}
- |
+ {{ object.group|linkify|placeholder }} |
| VLAN ID |
@@ -48,9 +42,9 @@
{% if object.tenant %}
{% if object.tenant.group %}
- {{ object.tenant.group }} /
+ {{ object.tenant.group|linkify }} /
{% endif %}
- {{ object.tenant }}
+ {{ object.tenant|linkify }}
{% else %}
None
{% endif %}
diff --git a/netbox/templates/ipam/vlangroup.html b/netbox/templates/ipam/vlangroup.html
index f92afce46b..822b4a0460 100644
--- a/netbox/templates/ipam/vlangroup.html
+++ b/netbox/templates/ipam/vlangroup.html
@@ -7,7 +7,7 @@
{{ block.super }}
{% if object.scope %}
{# TODO: This should link to a filtered list of VLANGroups #}
- {{ object.scope }}
+ {{ object.scope|linkify }}
{% endif %}
{% endblock %}
@@ -36,12 +36,7 @@
|
| Scope |
-
- {% if object.scope %}
- {{ object.scope }}
- {% else %}
- —
- {% endif %}
+ | {{ object.scope|linkify|placeholder }} |
| Permitted VIDs |
diff --git a/netbox/templates/ipam/vrf.html b/netbox/templates/ipam/vrf.html
index ae4f65887c..07cf74cbb3 100644
--- a/netbox/templates/ipam/vrf.html
+++ b/netbox/templates/ipam/vrf.html
@@ -20,13 +20,7 @@
| Tenant |
-
- {% if object.tenant %}
- {{ object.tenant }}
- {% else %}
- None
- {% endif %}
- |
+ {{ object.tenant|linkify|placeholder }} |
| Unique IP Space |
diff --git a/netbox/templates/tenancy/contact.html b/netbox/templates/tenancy/contact.html
index 6fa7c03d8d..3b97a5a200 100644
--- a/netbox/templates/tenancy/contact.html
+++ b/netbox/templates/tenancy/contact.html
@@ -19,13 +19,7 @@
| Group |
-
- {% if object.group %}
- {{ object.group }}
- {% else %}
- None
- {% endif %}
- |
+ {{ object.group|linkify|placeholder }} |
| Name |
diff --git a/netbox/templates/tenancy/contactgroup.html b/netbox/templates/tenancy/contactgroup.html
index 7aed8182b1..3f13dc932f 100644
--- a/netbox/templates/tenancy/contactgroup.html
+++ b/netbox/templates/tenancy/contactgroup.html
@@ -29,13 +29,7 @@
| Parent |
-
- {% if object.parent %}
- {{ object.parent }}
- {% else %}
- —
- {% endif %}
- |
+ {{ object.parent|linkify|placeholder }} |
| Contacts |
diff --git a/netbox/templates/tenancy/tenant.html b/netbox/templates/tenancy/tenant.html
index fb83a346f2..e4c1db0066 100644
--- a/netbox/templates/tenancy/tenant.html
+++ b/netbox/templates/tenancy/tenant.html
@@ -20,13 +20,7 @@
| Group |
-
- {% if object.group %}
- {{ object.group }}
- {% else %}
- None
- {% endif %}
- |
+ {{ object.group|linkify|placeholder }} |
| Description |
diff --git a/netbox/templates/tenancy/tenantgroup.html b/netbox/templates/tenancy/tenantgroup.html
index 653c40a87a..25f1fef1b8 100644
--- a/netbox/templates/tenancy/tenantgroup.html
+++ b/netbox/templates/tenancy/tenantgroup.html
@@ -37,13 +37,7 @@
| Parent |
-
- {% if object.parent %}
- {{ object.parent }}
- {% else %}
- —
- {% endif %}
- |
+ {{ object.parent|linkify|placeholder }} |
| Tenants |
diff --git a/netbox/templates/virtualization/cluster.html b/netbox/templates/virtualization/cluster.html
index b7af89bb21..8384d352f2 100644
--- a/netbox/templates/virtualization/cluster.html
+++ b/netbox/templates/virtualization/cluster.html
@@ -17,37 +17,19 @@
| Type |
- {{ object.type }} |
+ {{ object.type|linkify }} |
| Group |
-
- {% if object.group %}
- {{ object.group }}
- {% else %}
- None
- {% endif %}
- |
+ {{ object.group|linkify }} |
| Tenant |
-
- {% if object.tenant %}
- {{ object.tenant }}
- {% else %}
- None
- {% endif %}
- |
+ {{ object.tenant|linkify }} |
| Site |
-
- {% if object.site %}
- {{ object.site }}
- {% else %}
- None
- {% endif %}
- |
+ {{ object.site|linkify }} |
| Virtual Machines |
diff --git a/netbox/templates/virtualization/virtualmachine.html b/netbox/templates/virtualization/virtualmachine.html
index 22dd27b97b..ccb769167c 100644
--- a/netbox/templates/virtualization/virtualmachine.html
+++ b/netbox/templates/virtualization/virtualmachine.html
@@ -23,32 +23,20 @@
| Role |
-
- {% if object.role %}
- {{ object.role }}
- {% else %}
- None
- {% endif %}
- |
+ {{ object.role|linkify|placeholder }} |
| Platform |
-
- {% if object.platform %}
- {{ object.platform }}
- {% else %}
- None
- {% endif %}
- |
+ {{ object.platform|linkify|placeholder }} |
| Tenant |
{% if object.tenant %}
{% if object.tenant.group %}
- {{ object.tenant.group }} /
+ {{ object.tenant.group|linkify }} /
{% endif %}
- {{ object.tenant }}
+ {{ object.tenant|linkify }}
{% else %}
None
{% endif %}
@@ -103,9 +91,9 @@
| Cluster |
{% if object.cluster.group %}
- {{ object.cluster.group }} /
+ {{ object.cluster.group|linkify }} /
{% endif %}
- {{ object.cluster }}
+ {{ object.cluster|linkify }}
|
diff --git a/netbox/templates/virtualization/vminterface.html b/netbox/templates/virtualization/vminterface.html
index 6d10ce91e6..635654f86c 100644
--- a/netbox/templates/virtualization/vminterface.html
+++ b/netbox/templates/virtualization/vminterface.html
@@ -21,9 +21,7 @@
| Virtual Machine |
-
- {{ object.virtual_machine }}
- |
+ {{ object.virtual_machine|linkify }} |
| Name |
@@ -41,33 +39,15 @@
| Parent |
-
- {% if object.parent %}
- {{ object.parent }}
- {% else %}
- None
- {% endif %}
- |
+ {{ object.parent|linkify|placeholder }} |
| Bridge |
-
- {% if object.bridge %}
- {{ object.bridge }}
- {% else %}
- None
- {% endif %}
- |
+ {{ object.bridge|linkify|placeholder }} |
| VRF |
-
- {% if object.vrf %}
- {{ object.vrf }}
- {% else %}
- None
- {% endif %}
- |
+ {{ object.vrf|linkify|placeholder }} |
| Description |
diff --git a/netbox/templates/wireless/inc/wirelesslink_interface.html b/netbox/templates/wireless/inc/wirelesslink_interface.html
index e330475396..db4f84f0a0 100644
--- a/netbox/templates/wireless/inc/wirelesslink_interface.html
+++ b/netbox/templates/wireless/inc/wirelesslink_interface.html
@@ -3,15 +3,11 @@
| Device |
-
- {{ interface.device }}
- |
+ {{ interface.device|linkify }} |
| Interface |
-
- {{ interface }}
- |
+ {{ interface|linkify }} |
| Type |
diff --git a/netbox/templates/wireless/wirelesslan.html b/netbox/templates/wireless/wirelesslan.html
index a55d229749..185a44904c 100644
--- a/netbox/templates/wireless/wirelesslan.html
+++ b/netbox/templates/wireless/wirelesslan.html
@@ -16,13 +16,7 @@
| Group |
-
- {% if object.group %}
- {{ object.group }}
- {% else %}
- None
- {% endif %}
- |
+ {{ object.group|linkify|placeholder }} |
| Description |
@@ -30,13 +24,7 @@
| VLAN |
-
- {% if object.vlan %}
- {{ object.vlan }}
- {% else %}
- None
- {% endif %}
- |
+ {{ object.vlan|linkify|placeholder }} |
diff --git a/netbox/templates/wireless/wirelesslangroup.html b/netbox/templates/wireless/wirelesslangroup.html
index 226b39b1b5..2b8de0fb83 100644
--- a/netbox/templates/wireless/wirelesslangroup.html
+++ b/netbox/templates/wireless/wirelesslangroup.html
@@ -35,13 +35,7 @@
| Parent |
-
- {% if object.parent %}
- {{ object.parent }}
- {% else %}
- —
- {% endif %}
- |
+ {{ object.parent|linkify|placeholder }} |
| Wireless LANs |
diff --git a/netbox/utilities/templatetags/builtins/filters.py b/netbox/utilities/templatetags/builtins/filters.py
index afb40a3084..eba0daa0e3 100644
--- a/netbox/utilities/templatetags/builtins/filters.py
+++ b/netbox/utilities/templatetags/builtins/filters.py
@@ -20,6 +20,18 @@ register = template.Library()
# General
#
+@register.filter()
+def linkify(instance):
+ """
+ Render a hyperlink for object's with a `get_absolute_url()` method, using the object's string representation
+ as the link's text. If the object has no `get_absolute_url()` method, return an empty string.
+ """
+ try:
+ return mark_safe(f'{instance}')
+ except (AttributeError, TypeError):
+ return ''
+
+
@register.filter()
def bettertitle(value):
"""
| |