Procházet zdrojové kódy

Fixes #2554: Fix cable trace display when following a rear port with no cable attached

Jeremy Stretch před 7 roky
rodič
revize
04ae6ec7af
2 změnil soubory, kde provedl 17 přidání a 10 odebrání
  1. 1 0
      CHANGELOG.md
  2. 16 10
      netbox/templates/dcim/cable_trace.html

+ 1 - 0
CHANGELOG.md

@@ -39,6 +39,7 @@ NetBox now supports modeling physical cables for console, power, and interface c
 
 ## Changes From v2.5-beta1
 
+* [#2554](https://github.com/digitalocean/netbox/issues/2554) - Fix cable trace display when following a rear port with no cable attached
 * [#2563](https://github.com/digitalocean/netbox/issues/2563) - Enable export templates for cables
 * [#2566](https://github.com/digitalocean/netbox/issues/2566) - Prevent both ends of a cable from connecting to the same termination point
 * [#2567](https://github.com/digitalocean/netbox/issues/2567) - Introduced proxy models to represent console/power/interface connections

+ 16 - 10
netbox/templates/dcim/cable_trace.html

@@ -23,18 +23,24 @@
                 {% include 'dcim/inc/cable_trace_end.html' with end=near_end %}
             </div>
             <div class="col-md-3 text-center">
-                <h4>
-                    <a href="{% url 'dcim:cable' pk=cable.pk %}">
-                        {% if cable.label %}<code>{{ cable.label }}</code>{% else %}Cable #{{ cable.pk }}{% endif %}
-                    </a>
-                </h4>
-                {{ cable.get_status_display }}<br />
-                {{ cable.get_type_display|default:"" }}
-                {% if cable.length %}- {{ cable.length }}{{ cable.length_unit }}{% endif %}
-                <span class="label color-block center-block" style="background-color: #{{ cable.color }}">&nbsp;</span>
+                {% if cable %}
+                    <h4>
+                        <a href="{% url 'dcim:cable' pk=cable.pk %}">
+                            {% if cable.label %}<code>{{ cable.label }}</code>{% else %}Cable #{{ cable.pk }}{% endif %}
+                        </a>
+                    </h4>
+                    {{ cable.get_status_display }}<br />
+                    {{ cable.get_type_display|default:"" }}
+                    {% if cable.length %}- {{ cable.length }}{{ cable.length_unit }}{% endif %}
+                    <span class="label color-block center-block" style="background-color: #{{ cable.color }}">&nbsp;</span>
+                {% else %}
+                    <h4 class="text-muted">No Cable</h4>
+                {% endif %}
             </div>
             <div class="col-md-4">
-                {% include 'dcim/inc/cable_trace_end.html' with end=far_end %}
+                {% if far_end %}
+                    {% include 'dcim/inc/cable_trace_end.html' with end=far_end %}
+                {% endif %}
             </div>
         </div>
         {% if not forloop.last %}<hr />{% endif %}