Просмотр исходного кода

List device/VM component names first in tables by default

jeremystretch 4 лет назад
Родитель
Сommit
58203dbcfa
2 измененных файлов с 20 добавлено и 20 удалено
  1. 18 18
      netbox/dcim/tables/devices.py
  2. 2 2
      netbox/virtualization/tables.py

+ 18 - 18
netbox/dcim/tables/devices.py

@@ -288,10 +288,10 @@ class ConsolePortTable(DeviceComponentTable, PathEndpointTable):
     class Meta(DeviceComponentTable.Meta):
     class Meta(DeviceComponentTable.Meta):
         model = ConsolePort
         model = ConsolePort
         fields = (
         fields = (
-            'pk', 'device', 'name', 'label', 'type', 'speed', 'description', 'mark_connected', 'cable', 'cable_color',
+            'pk', 'name', 'device', 'label', 'type', 'speed', 'description', 'mark_connected', 'cable', 'cable_color',
             'cable_peer', 'connection', 'tags',
             'cable_peer', 'connection', 'tags',
         )
         )
-        default_columns = ('pk', 'device', 'name', 'label', 'type', 'speed', 'description')
+        default_columns = ('pk', 'name', 'device', 'label', 'type', 'speed', 'description')
 
 
 
 
 class DeviceConsolePortTable(ConsolePortTable):
 class DeviceConsolePortTable(ConsolePortTable):
@@ -332,10 +332,10 @@ class ConsoleServerPortTable(DeviceComponentTable, PathEndpointTable):
     class Meta(DeviceComponentTable.Meta):
     class Meta(DeviceComponentTable.Meta):
         model = ConsoleServerPort
         model = ConsoleServerPort
         fields = (
         fields = (
-            'pk', 'device', 'name', 'label', 'type', 'speed', 'description', 'mark_connected', 'cable', 'cable_color',
+            'pk', 'name', 'device', 'label', 'type', 'speed', 'description', 'mark_connected', 'cable', 'cable_color',
             'cable_peer', 'connection', 'tags',
             'cable_peer', 'connection', 'tags',
         )
         )
-        default_columns = ('pk', 'device', 'name', 'label', 'type', 'speed', 'description')
+        default_columns = ('pk', 'name', 'device', 'label', 'type', 'speed', 'description')
 
 
 
 
 class DeviceConsoleServerPortTable(ConsoleServerPortTable):
 class DeviceConsoleServerPortTable(ConsoleServerPortTable):
@@ -377,10 +377,10 @@ class PowerPortTable(DeviceComponentTable, PathEndpointTable):
     class Meta(DeviceComponentTable.Meta):
     class Meta(DeviceComponentTable.Meta):
         model = PowerPort
         model = PowerPort
         fields = (
         fields = (
-            'pk', 'device', 'name', 'label', 'type', 'description', 'mark_connected', 'maximum_draw', 'allocated_draw',
+            'pk', 'name', 'device', 'label', 'type', 'description', 'mark_connected', 'maximum_draw', 'allocated_draw',
             'cable', 'cable_color', 'cable_peer', 'connection', 'tags',
             'cable', 'cable_color', 'cable_peer', 'connection', 'tags',
         )
         )
-        default_columns = ('pk', 'device', 'name', 'label', 'type', 'maximum_draw', 'allocated_draw', 'description')
+        default_columns = ('pk', 'name', 'device', 'label', 'type', 'maximum_draw', 'allocated_draw', 'description')
 
 
 
 
 class DevicePowerPortTable(PowerPortTable):
 class DevicePowerPortTable(PowerPortTable):
@@ -428,10 +428,10 @@ class PowerOutletTable(DeviceComponentTable, PathEndpointTable):
     class Meta(DeviceComponentTable.Meta):
     class Meta(DeviceComponentTable.Meta):
         model = PowerOutlet
         model = PowerOutlet
         fields = (
         fields = (
-            'pk', 'device', 'name', 'label', 'type', 'description', 'power_port', 'feed_leg', 'mark_connected', 'cable',
+            'pk', 'name', 'device', 'label', 'type', 'description', 'power_port', 'feed_leg', 'mark_connected', 'cable',
             'cable_color', 'cable_peer', 'connection', 'tags',
             'cable_color', 'cable_peer', 'connection', 'tags',
         )
         )
-        default_columns = ('pk', 'device', 'name', 'label', 'type', 'power_port', 'feed_leg', 'description')
+        default_columns = ('pk', 'name', 'device', 'label', 'type', 'power_port', 'feed_leg', 'description')
 
 
 
 
 class DevicePowerOutletTable(PowerOutletTable):
 class DevicePowerOutletTable(PowerOutletTable):
@@ -490,11 +490,11 @@ class InterfaceTable(DeviceComponentTable, BaseInterfaceTable, PathEndpointTable
     class Meta(DeviceComponentTable.Meta):
     class Meta(DeviceComponentTable.Meta):
         model = Interface
         model = Interface
         fields = (
         fields = (
-            'pk', 'device', 'name', 'label', 'enabled', 'type', 'mgmt_only', 'mtu', 'mode', 'mac_address',
+            'pk', 'name', 'device', 'label', 'enabled', 'type', 'mgmt_only', 'mtu', 'mode', 'mac_address',
             'description', 'mark_connected', 'cable', 'cable_color', 'cable_peer', 'connection', 'tags', 'ip_addresses',
             'description', 'mark_connected', 'cable', 'cable_color', 'cable_peer', 'connection', 'tags', 'ip_addresses',
             'untagged_vlan', 'tagged_vlans',
             'untagged_vlan', 'tagged_vlans',
         )
         )
-        default_columns = ('pk', 'device', 'name', 'label', 'enabled', 'type', 'description')
+        default_columns = ('pk', 'name', 'device', 'label', 'enabled', 'type', 'description')
 
 
 
 
 class DeviceInterfaceTable(InterfaceTable):
 class DeviceInterfaceTable(InterfaceTable):
@@ -559,11 +559,11 @@ class FrontPortTable(DeviceComponentTable, CableTerminationTable):
     class Meta(DeviceComponentTable.Meta):
     class Meta(DeviceComponentTable.Meta):
         model = FrontPort
         model = FrontPort
         fields = (
         fields = (
-            'pk', 'device', 'name', 'label', 'type', 'color', 'rear_port', 'rear_port_position', 'description',
+            'pk', 'name', 'device', 'label', 'type', 'color', 'rear_port', 'rear_port_position', 'description',
             'mark_connected', 'cable', 'cable_color', 'cable_peer', 'tags',
             'mark_connected', 'cable', 'cable_color', 'cable_peer', 'tags',
         )
         )
         default_columns = (
         default_columns = (
-            'pk', 'device', 'name', 'label', 'type', 'color', 'rear_port', 'rear_port_position', 'description',
+            'pk', 'name', 'device', 'label', 'type', 'color', 'rear_port', 'rear_port_position', 'description',
         )
         )
 
 
 
 
@@ -610,10 +610,10 @@ class RearPortTable(DeviceComponentTable, CableTerminationTable):
     class Meta(DeviceComponentTable.Meta):
     class Meta(DeviceComponentTable.Meta):
         model = RearPort
         model = RearPort
         fields = (
         fields = (
-            'pk', 'device', 'name', 'label', 'type', 'color', 'positions', 'description', 'mark_connected', 'cable',
+            'pk', 'name', 'device', 'label', 'type', 'color', 'positions', 'description', 'mark_connected', 'cable',
             'cable_color', 'cable_peer', 'tags',
             'cable_color', 'cable_peer', 'tags',
         )
         )
-        default_columns = ('pk', 'device', 'name', 'label', 'type', 'color', 'description')
+        default_columns = ('pk', 'name', 'device', 'label', 'type', 'color', 'description')
 
 
 
 
 class DeviceRearPortTable(RearPortTable):
 class DeviceRearPortTable(RearPortTable):
@@ -662,8 +662,8 @@ class DeviceBayTable(DeviceComponentTable):
 
 
     class Meta(DeviceComponentTable.Meta):
     class Meta(DeviceComponentTable.Meta):
         model = DeviceBay
         model = DeviceBay
-        fields = ('pk', 'device', 'name', 'label', 'status', 'installed_device', 'description', 'tags')
-        default_columns = ('pk', 'device', 'name', 'label', 'status', 'installed_device', 'description')
+        fields = ('pk', 'name', 'device', 'label', 'status', 'installed_device', 'description', 'tags')
+        default_columns = ('pk', 'name', 'device', 'label', 'status', 'installed_device', 'description')
 
 
 
 
 class DeviceDeviceBayTable(DeviceBayTable):
 class DeviceDeviceBayTable(DeviceBayTable):
@@ -708,10 +708,10 @@ class InventoryItemTable(DeviceComponentTable):
     class Meta(BaseTable.Meta):
     class Meta(BaseTable.Meta):
         model = InventoryItem
         model = InventoryItem
         fields = (
         fields = (
-            'pk', 'device', 'name', 'label', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'description',
+            'pk', 'name', 'device', 'label', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'description',
             'discovered', 'tags',
             'discovered', 'tags',
         )
         )
-        default_columns = ('pk', 'device', 'name', 'label', 'manufacturer', 'part_id', 'serial', 'asset_tag')
+        default_columns = ('pk', 'name', 'device', 'label', 'manufacturer', 'part_id', 'serial', 'asset_tag')
 
 
 
 
 class DeviceInventoryItemTable(InventoryItemTable):
 class DeviceInventoryItemTable(InventoryItemTable):

+ 2 - 2
netbox/virtualization/tables.py

@@ -180,10 +180,10 @@ class VMInterfaceTable(BaseInterfaceTable):
     class Meta(BaseTable.Meta):
     class Meta(BaseTable.Meta):
         model = VMInterface
         model = VMInterface
         fields = (
         fields = (
-            'pk', 'virtual_machine', 'name', 'enabled', 'parent', 'mac_address', 'mtu', 'mode', 'description', 'tags',
+            'pk', 'name', 'virtual_machine', 'enabled', 'parent', 'mac_address', 'mtu', 'mode', 'description', 'tags',
             'ip_addresses', 'untagged_vlan', 'tagged_vlans',
             'ip_addresses', 'untagged_vlan', 'tagged_vlans',
         )
         )
-        default_columns = ('pk', 'virtual_machine', 'name', 'enabled', 'parent', 'description')
+        default_columns = ('pk', 'name', 'virtual_machine', 'enabled', 'parent', 'description')
 
 
 
 
 class VirtualMachineVMInterfaceTable(VMInterfaceTable):
 class VirtualMachineVMInterfaceTable(VMInterfaceTable):