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

Fixes #3290: Fix server error when viewing cascaded PDUs

Browse Source
This commit is contained in:
Jeremy Stretch 2019-06-24 10:05:21 -04:00
parent 5a6c928a7c
commit 70ef6a69ee
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -4,6 +4,7 @@ v2.6.1 (FUTURE)
* [#3275](https://github.com/digitalocean/netbox/issues/3275) - Fix error when adding power outlets to a device type * [#3275](https://github.com/digitalocean/netbox/issues/3275) - Fix error when adding power outlets to a device type
* [#3279](https://github.com/digitalocean/netbox/issues/3279) - Reset the PostgreSQL sequence for Tag and TaggedItem IDs * [#3279](https://github.com/digitalocean/netbox/issues/3279) - Reset the PostgreSQL sequence for Tag and TaggedItem IDs
* [#3290](https://github.com/digitalocean/netbox/issues/3290) - Fix server error when viewing cascaded PDUs
--- ---

2
netbox/templates/dcim/device.html
View File

@ -359,7 +359,7 @@
<td>{{ pp }}</td> <td>{{ pp }}</td>
<td>{{ utilization.outlet_count }}</td> <td>{{ utilization.outlet_count }}</td>
<td>{{ utilization.allocated }}VA</td> <td>{{ utilization.allocated }}VA</td>
{% if powerfeed %} {% if powerfeed.available_power %}
<td>{{ powerfeed.available_power }}VA</td> <td>{{ powerfeed.available_power }}VA</td>
<td>{% utilization_graph utilization.allocated|percentage:powerfeed.available_power %}</td> <td>{% utilization_graph utilization.allocated|percentage:powerfeed.available_power %}</td>
{% else %} {% else %}