From 70ef6a69ee0ee74926b524cb57083c3bc7427064 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 24 Jun 2019 10:05:21 -0400 Subject: [PATCH] Fixes #3290: Fix server error when viewing cascaded PDUs --- CHANGELOG.md | 1 + netbox/templates/dcim/device.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 55d10190b..31cc18af1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 * [#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 --- diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 5f0bbdfc0..414b61bb6 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -359,7 +359,7 @@ {{ pp }} {{ utilization.outlet_count }} {{ utilization.allocated }}VA - {% if powerfeed %} + {% if powerfeed.available_power %} {{ powerfeed.available_power }}VA {% utilization_graph utilization.allocated|percentage:powerfeed.available_power %} {% else %}