Fix display of circuit termination provider network

This commit is contained in:
jeremystretch 2021-07-29 11:14:12 -04:00
parent c323105696
commit 22d160b1da

View File

@ -25,69 +25,68 @@
<strong>Termination - {{ side }} Side</strong> <strong>Termination - {{ side }} Side</strong>
</div> </div>
<div class="card-body"> <div class="card-body">
{% if termination %} {% if termination %}
<table class="table table-hover attr-table"> <table class="table table-hover attr-table">
{% if termination.site %}
<tr> <tr>
<td>Site</td> <td>Site</td>
<td> <td>
{% if termination.site.region %} {% if termination.site.region %}
<a href="{{ termination.site.region.get_absolute_url }}">{{ termination.site.region }}</a> / <a href="{{ termination.site.region.get_absolute_url }}">{{ termination.site.region }}</a> /
{% endif %} {% endif %}
<a href="{{ termination.site.get_absolute_url }}">{{ termination.site }}</a> <a href="{{ termination.site.get_absolute_url }}">{{ termination.site }}</a>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>Termination</td> <td>Termination</td>
<td> <td>
{% if termination.mark_connected %} {% if termination.mark_connected %}
<span class="text-success"><i class="mdi mdi-check-bold"></i></span> <span class="text-success"><i class="mdi mdi-check-bold"></i></span>
<span class="text-muted">Marked as connected</span> <span class="text-muted">Marked as connected</span>
{% elif termination.cable %} {% elif termination.cable %}
<div class="float-end"> <div class="float-end">
<a href="{% url 'circuits:circuittermination_trace' pk=termination.pk %}" class="btn btn-primary btn-sm lh-1" title="Trace"> <a href="{% url 'circuits:circuittermination_trace' pk=termination.pk %}" class="btn btn-primary btn-sm lh-1" title="Trace">
<i class="mdi mdi-transit-connection-variant" aria-hidden="true"></i> <i class="mdi mdi-transit-connection-variant" aria-hidden="true"></i>
</a> </a>
{% if perms.dcim.delete_cable %} {% if perms.dcim.delete_cable %}
<a href="{% url 'dcim:cable_delete' pk=termination.cable.pk %}?return_url={{ termination.circuit.get_absolute_url }}" title="Remove cable" class="btn btn-danger btn-sm lh-1"> <a href="{% url 'dcim:cable_delete' pk=termination.cable.pk %}?return_url={{ termination.circuit.get_absolute_url }}" title="Remove cable" class="btn btn-danger btn-sm lh-1">
<i class="mdi mdi-ethernet-cable-off" aria-hidden="true"></i> Disconnect <i class="mdi mdi-ethernet-cable-off" aria-hidden="true"></i> Disconnect
</a> </a>
{% endif %} {% endif %}
</div> </div>
<a href="{{ termination.cable.get_absolute_url }}">{{ termination.cable }}</a>
<a href="{{ termination.cable.get_absolute_url }}">{{ termination.cable }}</a> {% with peer=termination.get_cable_peer %}
{% with peer=termination.get_cable_peer %} to
to {% if peer.device %}
{% if peer.device %} <a href="{{ peer.device.get_absolute_url }}">{{ peer.device }}</a><br/>
<a href="{{ peer.device.get_absolute_url }}">{{ peer.device }}</a><br/> {% elif peer.circuit %}
{% elif peer.circuit %} <a href="{{ peer.circuit.get_absolute_url }}">{{ peer.circuit }}</a><br/>
<a href="{{ peer.circuit.get_absolute_url }}">{{ peer.circuit }}</a><br/> {% endif %}
{% endif %} <a href="{{ peer.get_absolute_url }}">{{ peer }}</a>
<a href="{{ peer.get_absolute_url }}">{{ peer }}</a> {% endwith %}
{% endwith %} {% elif perms.dcim.add_cable %}
{% else %} <div class="dropdown">
{% if perms.dcim.add_cable %} <button type="button" class="btn btn-success btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<div class="dropdown"> <span class="mdi mdi-ethernet-cable" aria-hidden="true"></span> Connect
<button type="button" class="btn btn-success btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> </button>
<span class="mdi mdi-ethernet-cable" aria-hidden="true"></span> Connect <ul class="dropdown-menu">
</button> <li><a class="dropdown-item" href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk termination_b_type='interface' %}?termination_b_site={{ termination.site.pk }}&return_url={{ object.get_absolute_url }}">Interface</a></li>
<ul class="dropdown-menu"> <li><a class="dropdown-item" href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk termination_b_type='front-port' %}?termination_b_site={{ termination.site.pk }}&return_url={{ object.get_absolute_url }}">Front Port</a></li>
<li><a class="dropdown-item" href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk termination_b_type='interface' %}?termination_b_site={{ termination.site.pk }}&return_url={{ object.get_absolute_url }}">Interface</a></li> <li><a class="dropdown-item" href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk termination_b_type='rear-port' %}?termination_b_site={{ termination.site.pk }}&return_url={{ object.get_absolute_url }}">Rear Port</a></li>
<li><a class="dropdown-item" href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk termination_b_type='front-port' %}?termination_b_site={{ termination.site.pk }}&return_url={{ object.get_absolute_url }}">Front Port</a></li> <li><a class="dropdown-item" href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk termination_b_type='circuit-termination' %}?termination_b_site={{ termination.site.pk }}&return_url={{ object.get_absolute_url }}">Circuit Termination</a></li>
<li><a class="dropdown-item" href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk termination_b_type='rear-port' %}?termination_b_site={{ termination.site.pk }}&return_url={{ object.get_absolute_url }}">Rear Port</a></li> </ul>
<li><a class="dropdown-item" href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk termination_b_type='circuit-termination' %}?termination_b_site={{ termination.site.pk }}&return_url={{ object.get_absolute_url }}">Circuit Termination</a></li> </div>
</ul> {% endif %}
</div> </td>
{% endif %} </tr>
</td> {% else %}
</tr> <tr>
{% comment %} {% else %} {% endcomment %} <td>Provider Network</td>
<tr> <td>
<td>Provider Network</td> <a href="{{ termination.provider_network.get_absolute_url }}">{{ termination.provider_network }}</a>
<td> </td>
<a href="{{ termination.provider_network.get_absolute_url }}">{{ termination.provider_network }}</a> </tr>
</td> {% endif %}
</tr>
{% endif %}
<tr> <tr>
<td>Speed</td> <td>Speed</td>
<td> <td>