فهرست منبع

Fixes #3290: Fix server error when viewing cascaded PDUs

Jeremy Stretch 6 سال پیش
والد
کامیت
70ef6a69ee
2فایلهای تغییر یافته به همراه2 افزوده شده و 1 حذف شده
  1. 1 0
      CHANGELOG.md
  2. 1 1
      netbox/templates/dcim/device.html

+ 1 - 0
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
 * [#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
 
 
 ---
 ---
 
 

+ 1 - 1
netbox/templates/dcim/device.html

@@ -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 %}