From 8a2276e79136d8bac7b212ce1ad7f014ffb0de41 Mon Sep 17 00:00:00 2001
From: kkthxbye-code <festll234@gmail.com>
Date: Mon, 18 Jul 2022 16:17:16 +0200
Subject: [PATCH] Use segment_count for segment count on trace view

---
 netbox/templates/dcim/cable_trace.html | 72 +++++++++++++-------------
 1 file changed, 35 insertions(+), 37 deletions(-)

diff --git a/netbox/templates/dcim/cable_trace.html b/netbox/templates/dcim/cable_trace.html
index abe13b236..2611686f6 100644
--- a/netbox/templates/dcim/cable_trace.html
+++ b/netbox/templates/dcim/cable_trace.html
@@ -18,43 +18,41 @@
               </div>
             </div>
             <div class="trace-end">
-                {% with traced_path=path.origin.trace %}
-                    {% if path.is_split %}
-                        <h3 class="text-danger">Path split!</h3>
-                        <p>Select a node below to continue:</p>
-                        <ul class="text-start">
-                            {% for next_node in path.get_split_nodes %}
-                                {% if next_node.cable %}
-                                    <li>
-                                        <a href="{% url 'dcim:frontport_trace' pk=next_node.pk %}">{{ next_node }}</a>
-                                        (Cable {{ next_node.cable|linkify }})
-                                    </li>
-                                {% else %}
-                                    <li class="text-muted">{{ next_node }}</li>
-                                {% endif %}
-                            {% endfor %}
-                        </ul>
-                    {% else %}
-                        <h3 class="text-center text-success">Trace Completed</h3>
-                        <table class="table">
-                          <tr>
-                            <th scope="row">Total segments</th>
-                            <td>{{ traced_path|length }}</td>
-                          </tr>
-                          <tr>
-                            <th scope="row">Total length</th>
-                            <td>
-                              {% if total_length %}
-                                {{ total_length|floatformat:"-2" }}{% if not is_definitive %}+{% endif %} Meters /
-                                {{ total_length|meters_to_feet|floatformat:"-2" }} Feet
-                              {% else %}
-                                <span class="text-muted">N/A</span>
-                              {% endif %}
-                            </td>
-                          </tr>
-                        </table>
-                    {% endif %}
-                {% endwith %}
+                {% if path.is_split %}
+                    <h3 class="text-danger">Path split!</h3>
+                    <p>Select a node below to continue:</p>
+                    <ul class="text-start">
+                        {% for next_node in path.get_split_nodes %}
+                            {% if next_node.cable %}
+                                <li>
+                                    <a href="{% url 'dcim:frontport_trace' pk=next_node.pk %}">{{ next_node }}</a>
+                                    (Cable {{ next_node.cable|linkify }})
+                                </li>
+                            {% else %}
+                                <li class="text-muted">{{ next_node }}</li>
+                            {% endif %}
+                        {% endfor %}
+                    </ul>
+                {% else %}
+                    <h3 class="text-center text-success">Trace Completed</h3>
+                    <table class="table">
+                        <tr>
+                        <th scope="row">Total segments</th>
+                        <td>{{ path.segment_count }}</td>
+                        </tr>
+                        <tr>
+                        <th scope="row">Total length</th>
+                        <td>
+                            {% if total_length %}
+                            {{ total_length|floatformat:"-2" }}{% if not is_definitive %}+{% endif %} Meters /
+                            {{ total_length|meters_to_feet|floatformat:"-2" }} Feet
+                            {% else %}
+                            <span class="text-muted">N/A</span>
+                            {% endif %}
+                        </td>
+                        </tr>
+                    </table>
+                {% endif %}
             </div>
           {% else %}
             <h3 class="text-center text-muted my-3">