diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index e96cd254b..d2e2dfd38 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -644,8 +644,6 @@ class DeviceImportTable(BaseTable): # class DeviceComponentDetailTable(BaseTable): - component_type = '' - pk = ToggleColumn() cable = tables.LinkColumn() @@ -663,7 +661,6 @@ class ConsolePortTable(BaseTable): class ConsolePortDetailTable(DeviceComponentDetailTable): - component_type = 'Console Ports' device = tables.LinkColumn() class Meta(DeviceComponentDetailTable.Meta, ConsolePortTable.Meta): @@ -678,7 +675,6 @@ class ConsoleServerPortTable(BaseTable): class ConsoleServerPortDetailTable(DeviceComponentDetailTable): - component_type = 'Console Server Ports' device = tables.LinkColumn() class Meta(DeviceComponentDetailTable.Meta, ConsoleServerPortTable.Meta): @@ -693,7 +689,6 @@ class PowerPortTable(BaseTable): class PowerPortDetailTable(DeviceComponentDetailTable): - component_type = 'Power Ports' device = tables.LinkColumn() class Meta(DeviceComponentDetailTable.Meta, PowerPortTable.Meta): @@ -708,7 +703,6 @@ class PowerOutletTable(BaseTable): class PowerOutletDetailTable(DeviceComponentDetailTable): - component_type = 'Power Outlets' device = tables.LinkColumn() class Meta(DeviceComponentDetailTable.Meta, PowerOutletTable.Meta): @@ -723,10 +717,9 @@ class InterfaceTable(BaseTable): class InterfaceDetailTable(DeviceComponentDetailTable): - component_type = 'Interfaces' parent = tables.LinkColumn(order_by=('device', 'virtual_machine')) - class Meta(InterfaceTable.Meta, DeviceComponentDetailTable.Meta): + class Meta(InterfaceTable.Meta): order_by = ('parent', 'name') fields = ('pk', 'parent', 'name', 'type', 'description', 'cable') sequence = ('pk', 'parent', 'name', 'type', 'description', 'cable') @@ -741,7 +734,6 @@ class FrontPortTable(BaseTable): class FrontPortDetailTable(DeviceComponentDetailTable): - component_type = 'Front Ports' device = tables.LinkColumn() class Meta(DeviceComponentDetailTable.Meta, FrontPortTable.Meta): @@ -757,7 +749,6 @@ class RearPortTable(BaseTable): class RearPortDetailTable(DeviceComponentDetailTable): - component_type = 'Rear Ports' device = tables.LinkColumn() class Meta(DeviceComponentDetailTable.Meta, RearPortTable.Meta): @@ -772,11 +763,10 @@ class DeviceBayTable(BaseTable): class DeviceBayDetailTable(DeviceComponentDetailTable): - component_type = 'Device Bays' device = tables.LinkColumn() installed_device = tables.LinkColumn() - class Meta(DeviceComponentDetailTable.Meta, DeviceBayTable.Meta): + class Meta(DeviceBayTable.Meta): fields = ('pk', 'name', 'device', 'installed_device') sequence = ('pk', 'name', 'device', 'installed_device') exclude = ('cable',) diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index c3a44b2e1..6677c85d2 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -1402,7 +1402,6 @@ class PowerOutletBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # class InterfaceListView(PermissionRequiredMixin, ObjectListView): - type = 'Interface' permission_required = 'dcim.view_interface' queryset = Interface.objects.prefetch_related('device', 'device__tenant', 'device__site', 'cable') filter = filters.InterfaceFilter diff --git a/netbox/templates/dcim/device_component_list.html b/netbox/templates/dcim/device_component_list.html index 8c2e57c4f..3936a1c19 100644 --- a/netbox/templates/dcim/device_component_list.html +++ b/netbox/templates/dcim/device_component_list.html @@ -1,11 +1,12 @@ {% extends '_base.html' %} {% load buttons %} +{% load helpers %} {% block content %}
-