Sfoglia il codice sorgente

Convert device power ports list to table

Jeremy Stretch 5 anni fa
parent
commit
3a47e0e2ed

+ 29 - 3
netbox/dcim/tables/devices.py

@@ -12,18 +12,19 @@ from utilities.tables import (
 )
 from .template_code import (
     CABLETERMINATION, CONSOLEPORT_BUTTONS, CONSOLESERVERPORT_BUTTONS, DEVICE_LINK, INTERFACE_IPADDRESSES,
-    INTERFACE_TAGGED_VLANS,
+    INTERFACE_TAGGED_VLANS, POWERPORT_BUTTONS,
 )
 
 __all__ = (
     'ConsolePortTable',
     'ConsoleServerPortTable',
+    'DeviceBayTable',
     'DeviceConsolePortTable',
     'DeviceConsoleServerPortTable',
     'DeviceImportTable',
-    'DeviceTable',
-    'DeviceBayTable',
+    'DevicePowerPortTable',
     'DeviceRoleTable',
+    'DeviceTable',
     'FrontPortTable',
     'InterfaceTable',
     'InventoryItemTable',
@@ -309,6 +310,31 @@ class PowerPortTable(DeviceComponentTable, PathEndpointTable):
         default_columns = ('pk', 'device', 'name', 'label', 'type', 'maximum_draw', 'allocated_draw', 'description')
 
 
+class DevicePowerPortTable(PowerPortTable):
+    name = tables.TemplateColumn(
+        template_code='<i class="fa fa-bolt"></i> <a href="{{ record.get_absolute_url }}">{{ value }}</a>'
+    )
+    actions = ButtonsColumn(
+        model=PowerPort,
+        buttons=('edit', 'delete'),
+        prepend_template=POWERPORT_BUTTONS
+    )
+
+    class Meta(DeviceComponentTable.Meta):
+        model = PowerPort
+        fields = (
+            'pk', 'name', 'label', 'type', 'description', 'maximum_draw', 'allocated_draw', 'cable', 'cable_peer',
+            'connection', 'tags', 'actions',
+        )
+        default_columns = (
+            'pk', 'name', 'label', 'type', 'maximum_draw', 'allocated_draw', 'description', 'cable', 'cable_peer',
+            'actions',
+        )
+        row_attrs = {
+            'class': lambda record: record.cable.get_status_class() if record.cable else ''
+        }
+
+
 class PowerOutletTable(DeviceComponentTable, PathEndpointTable):
     tags = TagColumn(
         url_name='dcim:poweroutlet_list'

+ 16 - 0
netbox/dcim/tables/template_code.py

@@ -111,3 +111,19 @@ CONSOLESERVERPORT_BUTTONS = """
     </span>
 {% endif %}
 """
+
+POWERPORT_BUTTONS = """
+{% if record.cable %}
+    {% include 'dcim/inc/cable_toggle_buttons.html' with cable=record.cable %}
+{% elif perms.dcim.add_cable %}
+    <span class="dropdown">
+        <button type="button" class="btn btn-success btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            <span class="glyphicon glyphicon-resize-small" aria-hidden="true"></span>
+        </button>
+        <ul class="dropdown-menu dropdown-menu-right">
+            <li><a href="{% url 'dcim:powerport_connect' termination_a_id=record.pk termination_b_type='power-outlet' %}?return_url={{ device.get_absolute_url }}">Power Outlet</a></li>
+            <li><a href="{% url 'dcim:powerport_connect' termination_a_id=record.pk termination_b_type='power-feed' %}?return_url={{ device.get_absolute_url }}">Power Feed</a></li>
+        </ul>
+    </span>
+{% endif %}
+"""

+ 4 - 1
netbox/dcim/views.py

@@ -1038,6 +1038,9 @@ class DeviceView(ObjectView):
         powerports = PowerPort.objects.restrict(request.user, 'view').filter(device=device).prefetch_related(
             'cable', '_path__destination',
         )
+        powerport_table = tables.DevicePowerPortTable(powerports, orderable=False)
+        if request.user.has_perm('dcim.change_powerport') or request.user.has_perm('dcim.delete_powerport'):
+            powerport_table.columns.show('pk')
 
         # Power outlets
         poweroutlets = PowerOutlet.objects.restrict(request.user, 'view').filter(device=device).prefetch_related(
@@ -1088,7 +1091,7 @@ class DeviceView(ObjectView):
             'device': device,
             'consoleport_table': consoleport_table,
             'consoleserverport_table': consoleserverport_table,
-            'powerports': powerports,
+            'powerport_table': powerport_table,
             'poweroutlets': poweroutlets,
             'interfaces': interfaces,
             'frontports': frontports,

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

@@ -137,7 +137,7 @@
                     <a href="#consoleserverports" role="tab" data-toggle="tab">Console Server Ports {% badge consoleserverport_table.rows|length %}</a>
                 </li>
                 <li role="presentation">
-                    <a href="#powerports" role="tab" data-toggle="tab">Power Ports {% badge powerports|length %}</a>
+                    <a href="#powerports" role="tab" data-toggle="tab">Power Ports {% badge powerport_table.rows|length %}</a>
                 </li>
                 <li role="presentation">
                     <a href="#poweroutlets" role="tab" data-toggle="tab">Power Outlets {% badge poweroutlets|length %}</a>
@@ -744,27 +744,9 @@
                             <div class="panel-heading">
                                 <strong>Power Ports</strong>
                             </div>
-                            <table class="table table-hover panel-body component-list">
-                                <thead>
-                                    <tr>
-                                        {% if perms.dcim.change_consoleport or perms.dcim.delete_consoleport %}
-                                            <th class="pk"><input type="checkbox" class="toggle" title="Toggle all" /></th>
-                                        {% endif %}
-                                        <th>Name</th>
-                                        <th>Type</th>
-                                        <th>Draw</th>
-                                        <th>Description</th>
-                                        <th>Cable</th>
-                                        <th colspan="2">Connection</th>
-                                        <th></th>
-                                    </tr>
-                                </thead>
-                                {% for pp in powerports %}
-                                    {% include 'dcim/inc/powerport.html' %}
-                                {% endfor %}
-                            </table>
+                            {% include 'responsive_table.html' with table=powerport_table %}
                             <div class="panel-footer noprint">
-                                {% if powerports and perms.dcim.change_powerport %}
+                                {% if perms.dcim.change_powerport %}
                                     <button type="submit" name="_rename" formaction="{% url 'dcim:powerport_bulk_rename' %}?return_url={{ device.get_absolute_url }}" class="btn btn-warning btn-xs">
                                         <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Rename
                                     </button>
@@ -775,7 +757,7 @@
                                         <span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> Disconnect
                                     </button>
                                 {% endif %}
-                                {% if powerports and perms.dcim.delete_powerport %}
+                                {% if perms.dcim.delete_powerport %}
                                     <button type="submit" name="_delete" formaction="{% url 'dcim:powerport_bulk_delete' %}?return_url={{ device.get_absolute_url }}" class="btn btn-danger btn-xs">
                                         <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete
                                     </button>

+ 0 - 82
netbox/templates/dcim/inc/powerport.html

@@ -1,82 +0,0 @@
-<tr class="powerport{% if pp.cable %} {{ pp.cable.get_status_class }}{% endif %}">
-
-    {# Checkbox #}
-    {% if perms.dcim.change_powerport or perms.dcim.delete_powerport %}
-        <td class="pk">
-            <input name="pk" type="checkbox" value="{{ pp.pk }}" />
-        </td>
-    {% endif %}
-
-    {# Name #}
-    <td>
-        <i class="fa fa-fw fa-bolt"></i>
-        <a href="{{ pp.get_absolute_url }}">{{ pp }}</a>
-    </td>
-
-    {# Type #}
-    <td>
-        {{ pp.get_type_display }}
-    </td>
-
-    {# Current draw #}
-    <td>
-        {% if pp.allocated_draw %}
-            {{ pp.allocated_draw }}W{% if pp.maximum_draw %} ({{ pp.maximum_draw }}W max){% endif %}
-        {% elif pp.maximum_draw %}
-            {{ pp.maximum_draw }}W
-        {% endif %}
-    </td>
-
-    {# Description #}
-    <td>
-        {{ pp.description }}
-    </td>
-
-    {# Cable #}
-    {% if pp.cable %}
-        <td>
-            <a href="{{ pp.cable.get_absolute_url }}">{{ pp.cable }}</a>
-            <a href="{% url 'dcim:powerport_trace' pk=pp.pk %}" class="btn btn-primary btn-xs" title="Trace">
-                <i class="fa fa-share-alt" aria-hidden="true"></i>
-            </a>
-        </td>
-    {% else %}
-        <td><span class="text-muted">Not connected</span></td>
-    {% endif %}
-
-    {# Connection #}
-    {% include 'dcim/inc/endpoint_connection.html' with path=pp.path %}
-
-    {# Actions #}
-    <td class="text-right noprint">
-        {% if pp.cable %}
-            {% include 'dcim/inc/cable_toggle_buttons.html' with cable=pp.cable %}
-        {% elif perms.dcim.add_cable %}
-            <span class="dropdown">
-                <button type="button" class="btn btn-success btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                    <span class="glyphicon glyphicon-resize-small" aria-hidden="true"></span>
-                </button>
-                <ul class="dropdown-menu dropdown-menu-right">
-                    <li><a href="{% url 'dcim:powerport_connect' termination_a_id=pp.pk termination_b_type='power-outlet' %}?return_url={{ device.get_absolute_url }}">Power Outlet</a></li>
-                    <li><a href="{% url 'dcim:powerport_connect' termination_a_id=pp.pk termination_b_type='power-feed' %}?return_url={{ device.get_absolute_url }}">Power Feed</a></li>
-                </ul>
-            </span>
-        {% endif %}
-        {% if perms.dcim.change_powerport %}
-            <a href="{% url 'dcim:powerport_edit' pk=pp.pk %}?return_url={{ device.get_absolute_url }}" title="Edit port" class="btn btn-info btn-xs">
-                <i class="glyphicon glyphicon-pencil" aria-hidden="true"></i>
-            </a>
-        {% endif %}
-        {% if perms.dcim.delete_powerport %}
-            {% if pp.connected_endpoint %}
-                <button class="btn btn-danger btn-xs" disabled="disabled">
-                    <i class="glyphicon glyphicon-trash" aria-hidden="true"></i>
-                </button>
-            {% else %}
-                <a href="{% url 'dcim:powerport_delete' pk=pp.pk %}?return_url={{ device.get_absolute_url }}" title="Delete port" class="btn btn-danger btn-xs">
-                    <i class="glyphicon glyphicon-trash" aria-hidden="true"></i>
-                </a>
-            {% endif %}
-        {% endif %}
-    </td>
-</tr>