Ver Fonte

Fixes #5584: Restore power utilization panel under device view

Jeremy Stretch há 5 anos atrás
pai
commit
47b7ec8d00
2 ficheiros alterados com 12 adições e 4 exclusões
  1. 8 0
      docs/release-notes/version-2.10.md
  2. 4 4
      netbox/templates/dcim/device.html

+ 8 - 0
docs/release-notes/version-2.10.md

@@ -1,5 +1,13 @@
 # NetBox v2.10
 
+## v2.10.4 (FUTURE)
+
+### Bug Fixes
+
+* [#5584](https://github.com/netbox-community/netbox/issues/5584) - Restore power utilization panel under device view
+
+---
+
 ## v2.10.3 (2021-01-05)
 
 ### Bug Fixes

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

@@ -204,7 +204,7 @@
                             {% plugin_left_page object %}
                         </div>
                         <div class="col-md-6">
-                            {% if power_ports and poweroutlets %}
+                            {% if object.powerports.exists and object.poweroutlets.exists %}
                                 <div class="panel panel-default">
                                     <div class="panel-heading">
                                         <strong>Power Utilization</strong>
@@ -217,10 +217,10 @@
                                             <th>Available</th>
                                             <th>Utilization</th>
                                         </tr>
-                                        {% for pp in power_ports %}
-                                            {% with utilization=pp.get_power_draw powerfeed=pp.connected_endpoint %}
+                                        {% for powerport in object.powerports.all %}
+                                            {% with utilization=powerport.get_power_draw powerfeed=powerport.connected_endpoint %}
                                                 <tr>
-                                                    <td>{{ pp }}</td>
+                                                    <td>{{ powerport }}</td>
                                                     <td>{{ utilization.outlet_count }}</td>
                                                     <td>{{ utilization.allocated }}VA</td>
                                                     {% if powerfeed.available_power %}