mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Fixes #3720: Correctly indicate power feed terminations on cable list

Browse Source
This commit is contained in:
Jeremy Stretch
2019-11-26 16:56:11 -05:00
parent 1d18948307
commit 15722c1871
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes/version-2.6.md
View File

@ -13,6 +13,7 @@
* [#3674](https://github.com/netbox-community/netbox/issues/3674) - Include comments on PowerFeed view * [#3674](https://github.com/netbox-community/netbox/issues/3674) - Include comments on PowerFeed view
* [#3679](https://github.com/netbox-community/netbox/issues/3679) - Fix link for assigned ipaddress in interface page * [#3679](https://github.com/netbox-community/netbox/issues/3679) - Fix link for assigned ipaddress in interface page
* [#3709](https://github.com/netbox-community/netbox/issues/3709) - Prevent exception when importing an invalid cable definition * [#3709](https://github.com/netbox-community/netbox/issues/3709) - Prevent exception when importing an invalid cable definition
* [#3720](https://github.com/netbox-community/netbox/issues/3720) - Correctly indicate power feed terminations on cable list
# v2.6.7 (2019-11-01) # v2.6.7 (2019-11-01)

8
netbox/dcim/tables.py
View File

@ -181,8 +181,10 @@ VIRTUALCHASSIS_ACTIONS = """
CABLE_TERMINATION_PARENT = """ CABLE_TERMINATION_PARENT = """
{% if value.device %} {% if value.device %}
<a href="{{ value.device.get_absolute_url }}">{{ value.device }}</a> <a href="{{ value.device.get_absolute_url }}">{{ value.device }}</a>
{% else %} {% elif value.circuit %}
<a href="{{ value.circuit.get_absolute_url }}">{{ value.circuit }}</a> <a href="{{ value.circuit.get_absolute_url }}">{{ value.circuit }}</a>
{% elif value.power_panel %}
<a href="{{ value.power_panel.get_absolute_url }}">{{ value.power_panel }}</a>
{% endif %} {% endif %}
""" """
@ -718,7 +720,7 @@ class CableTable(BaseTable):
orderable=False, orderable=False,
verbose_name='Termination A' verbose_name='Termination A'
) )
termination_a = tables.Column( termination_a = tables.LinkColumn(
accessor=Accessor('termination_a'), accessor=Accessor('termination_a'),
orderable=False, orderable=False,
verbose_name='' verbose_name=''
@ -729,7 +731,7 @@ class CableTable(BaseTable):
orderable=False, orderable=False,
verbose_name='Termination B' verbose_name='Termination B'
) )
termination_b = tables.Column( termination_b = tables.LinkColumn(
accessor=Accessor('termination_b'), accessor=Accessor('termination_b'),
orderable=False, orderable=False,
verbose_name='' verbose_name=''