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 #3258: Exception raised when creating/viewing a circuit with a non-connected termination

Browse Source
This commit is contained in:
Jeremy Stretch 2019-06-17 16:27:26 -04:00
parent b884341d73
commit 948286aa32
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -11,6 +11,7 @@ v2.6.0 (FUTURE)
* [#3140](https://github.com/digitalocean/netbox/issues/3140) - Add bulk edit capability for power outlets and console server ports * [#3140](https://github.com/digitalocean/netbox/issues/3140) - Add bulk edit capability for power outlets and console server ports
* [#3204](https://github.com/digitalocean/netbox/issues/3204) - Fix interface filtering when connecting cables * [#3204](https://github.com/digitalocean/netbox/issues/3204) - Fix interface filtering when connecting cables
* [#3207](https://github.com/digitalocean/netbox/issues/3207) - Fix link for connecting interface to rear port * [#3207](https://github.com/digitalocean/netbox/issues/3207) - Fix link for connecting interface to rear port
* [#3258](https://github.com/digitalocean/netbox/issues/3258) - Exception raised when creating/viewing a circuit with a non-connected termination
## Enhancements (From Beta) ## Enhancements (From Beta)

13
netbox/templates/circuits/inc/circuit_termination.html
View File

@ -55,9 +55,16 @@
{% else %} {% else %}
{% if perms.dcim.add_cable %} {% if perms.dcim.add_cable %}
<div class="pull-right"> <div class="pull-right">
<a href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk %}?return_url={{ circuit.get_absolute_url }}" class="btn btn-success btn-xs" title="Connect"> <span class="dropdown">
<i class="glyphicon glyphicon-resize-small" aria-hidden="true"></i> Connect <button type="button" class="btn btn-success btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
</a> <span class="glyphicon glyphicon-resize-small" aria-hidden="true"></span> Connect
</button>
<ul class="dropdown-menu dropdown-menu-right">
<li><a href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk termination_b_type='interface' %}?return_url={{ device.get_absolute_url }}">Interface</a></li>
<li><a href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk termination_b_type='front-port' %}?return_url={{ device.get_absolute_url }}">Front Port</a></li>
<li><a href="{% url 'circuits:circuittermination_connect' termination_a_id=termination.pk termination_b_type='rear-port' %}?return_url={{ device.get_absolute_url }}">Rear Port</a></li>
</ul>
</span>
</div> </div>
{% endif %} {% endif %}
<span class="text-muted">Not defined</span> <span class="text-muted">Not defined</span>