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

Merge branch 'temp' into feature

Browse Source
This commit is contained in:
jeremystretch 2022-07-26 08:36:50 -04:00
commit 7631722f97
2 changed files with 63 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/release-notes/version-3.3.md
View File

@ -103,6 +103,8 @@ Custom field UI visibility has no impact on API operation.
* [#9730](https://github.com/netbox-community/netbox/issues/9730) - Fix validation error when creating a new cable via UI form * [#9730](https://github.com/netbox-community/netbox/issues/9730) - Fix validation error when creating a new cable via UI form
* [#9733](https://github.com/netbox-community/netbox/issues/9733) - Handle split paths during trace when fanning out to front ports with differing cables * [#9733](https://github.com/netbox-community/netbox/issues/9733) - Handle split paths during trace when fanning out to front ports with differing cables
* [#9765](https://github.com/netbox-community/netbox/issues/9765) - Report correct segment count under cable trace UI view * [#9765](https://github.com/netbox-community/netbox/issues/9765) - Report correct segment count under cable trace UI view
* [#9794](https://github.com/netbox-community/netbox/issues/9794) - Fix link to connect a rear port to a circuit termination
* [#9818](https://github.com/netbox-community/netbox/issues/9818) - Fix circuit side selection when connecting a cable to a circuit termination
* [#9844](https://github.com/netbox-community/netbox/issues/9844) - Fix interface api request when creating/editing L2VPN termination * [#9844](https://github.com/netbox-community/netbox/issues/9844) - Fix interface api request when creating/editing L2VPN termination
### Plugins API ### Plugins API

118
netbox/templates/dcim/inc/cable_termination.html
View File

@ -1,58 +1,62 @@
{% load helpers %} {% load helpers %}
<table class="table table-hover panel-body attr-table"> {% if terminations.0 %}
{% if terminations.0.device %} <table class="table table-hover panel-body attr-table">
{# Device component #} {% if terminations.0.device %}
<tr> {# Device component #}
<td>Site</td> <tr>
<td>{{ terminations.0.device.site|linkify }}</td> <td>Site</td>
</tr> <td>{{ terminations.0.device.site|linkify }}</td>
<tr> </tr>
<td>Rack</td> <tr>
<td>{{ terminations.0.device.rack|linkify|placeholder }}</td> <td>Rack</td>
</tr> <td>{{ terminations.0.device.rack|linkify|placeholder }}</td>
<tr> </tr>
<td>Device</td> <tr>
<td>{{ terminations.0.device|linkify }}</td> <td>Device</td>
</tr> <td>{{ terminations.0.device|linkify }}</td>
<tr> </tr>
<td>{{ terminations.0|meta:"verbose_name"|capfirst }}</td> <tr>
<td> <td>{{ terminations.0|meta:"verbose_name"|capfirst }}</td>
{% for term in terminations %} <td>
{{ term|linkify }}{% if not forloop.last %},{% endif %} {% for term in terminations %}
{% endfor %} {{ term|linkify }}{% if not forloop.last %},{% endif %}
</td> {% endfor %}
</tr> </td>
{% elif terminations.0.power_panel %} </tr>
{# Power feed #} {% elif terminations.0.power_panel %}
<tr> {# Power feed #}
<td>Site</td> <tr>
<td>{{ terminations.0.power_panel.site|linkify }}</td> <td>Site</td>
</tr> <td>{{ terminations.0.power_panel.site|linkify }}</td>
<tr> </tr>
<td>Power Panel</td> <tr>
<td>{{ terminations.0.power_panel|linkify }}</td> <td>Power Panel</td>
</tr> <td>{{ terminations.0.power_panel|linkify }}</td>
<tr> </tr>
<td>{{ terminations.0|meta:"verbose_name"|capfirst }}</td> <tr>
<td> <td>{{ terminations.0|meta:"verbose_name"|capfirst }}</td>
{% for term in terminations %} <td>
{{ term|linkify }}{% if not forloop.last %},{% endif %} {% for term in terminations %}
{% endfor %} {{ term|linkify }}{% if not forloop.last %},{% endif %}
</td> {% endfor %}
</tr> </td>
{% else %} </tr>
{# Circuit termination #} {% elif terminations.0.circuit %}
<tr> {# Circuit termination #}
<td>Provider</td> <tr>
<td>{{ terminations.0.circuit.provider|linkify }}</td> <td>Provider</td>
</tr> <td>{{ terminations.0.circuit.provider|linkify }}</td>
<tr> </tr>
<td>Circuit</td> <tr>
<td> <td>Circuit</td>
{% for term in terminations %} <td>
{{ term.circuit|linkify }} ({{ term }}){% if not forloop.last %},{% endif %} {% for term in terminations %}
{% endfor %} {{ term.circuit|linkify }} ({{ term }}){% if not forloop.last %},{% endif %}
</td> {% endfor %}
</tr> </td>
{% endif %} </tr>
</table> {% endif %}
</table>
{% else %}
<span class="text-muted">No termination</span>
{% endif %}