diff --git a/netbox/templates/core/job/base.html b/netbox/templates/core/job/base.html
index a31c53a8a..151702946 100644
--- a/netbox/templates/core/job/base.html
+++ b/netbox/templates/core/job/base.html
@@ -10,11 +10,9 @@
{{ object.object|meta:"verbose_name_plural"|bettertitle }}
- {% with parent_jobs_viewname=object.object|viewname:"jobs" %}
-
- {{ object.object }}
-
- {% endwith %}
+
+ {{ object.object }}
+
{% else %}
{{ object.name }}
diff --git a/netbox/templates/dcim/inc/cable_termination.html b/netbox/templates/dcim/inc/cable_termination.html
index 1284bc420..ae7a59d20 100644
--- a/netbox/templates/dcim/inc/cable_termination.html
+++ b/netbox/templates/dcim/inc/cable_termination.html
@@ -23,11 +23,9 @@
{{ term.device|linkify }}
{{ term|linkify }}
- {% with trace_url=term|viewname:"trace" %}
-
-
-
- {% endwith %}
+
+
+
{% if not forloop.last %}
{% endif %}
{% endfor %}
@@ -47,11 +45,9 @@
{% for term in terminations %}
{{ term|linkify }}
- {% with trace_url=term|viewname:"trace" %}
-
-
-
- {% endwith %}
+
+
+
{% if not forloop.last %} {% endif %}
{% endfor %}
|
@@ -67,11 +63,9 @@
{% for term in terminations %}
{{ term.circuit|linkify }} ({{ term }})
- {% with trace_url=term|viewname:"trace" %}
-
-
-
- {% endwith %}
+
+
+
{% if not forloop.last %} {% endif %}
{% endfor %}
|
diff --git a/netbox/templates/extras/object_imageattachments.html b/netbox/templates/extras/object_imageattachments.html
index 0f6947a95..9c3c137a9 100644
--- a/netbox/templates/extras/object_imageattachments.html
+++ b/netbox/templates/extras/object_imageattachments.html
@@ -6,11 +6,9 @@
{% block extra_controls %}
{% if perms.extras.add_imageattachment %}
- {% with viewname=object|viewname:"image-attachments" %}
-
- {% trans "Attach an Image" %}
-
- {% endwith %}
+
+ {% trans "Attach an Image" %}
+
{% endif %}
{% endblock %}
diff --git a/netbox/templates/extras/tag.html b/netbox/templates/extras/tag.html
index 166a1211b..61d130322 100644
--- a/netbox/templates/extras/tag.html
+++ b/netbox/templates/extras/tag.html
@@ -61,19 +61,18 @@
diff --git a/netbox/templates/generic/object.html b/netbox/templates/generic/object.html
index 4bccf108c..437690b3d 100644
--- a/netbox/templates/generic/object.html
+++ b/netbox/templates/generic/object.html
@@ -33,7 +33,7 @@ Context:
{% block breadcrumbs %}
-
- {{ object|meta:'verbose_name_plural'|bettertitle }}
+ {{ object|meta:'verbose_name_plural'|bettertitle }}
{% endblock breadcrumbs %}
diff --git a/netbox/templates/htmx/quick_add.html b/netbox/templates/htmx/quick_add.html
index 9473e14a1..b3be6ae1c 100644
--- a/netbox/templates/htmx/quick_add.html
+++ b/netbox/templates/htmx/quick_add.html
@@ -10,7 +10,7 @@