NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-14 09:51:22 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jeremy Stretch 2018-11-09 15:22:34 -05:00
parent 3bbf4a3352
commit 04ae6ec7af
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -39,6 +39,7 @@ NetBox now supports modeling physical cables for console, power, and interface c
## Changes From v2.5-beta1 ## 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 * [#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 * [#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 * [#2567](https://github.com/digitalocean/netbox/issues/2567) - Introduced proxy models to represent console/power/interface connections

6
netbox/templates/dcim/cable_trace.html
View File

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