NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-13 11:08:18 -06:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

netbox-community/netbox#6930: Move ID column to BaseTable class

Browse Source
This commit is contained in:
Rhys Barrie 2021-10-29 11:20:17 -04:00
parent 61d20639db
commit 02f2cf49e2
15 changed files with 5 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
netbox/circuits/tables.py
View File

@ -29,10 +29,6 @@ CIRCUITTERMINATION_LINK = """
class ProviderTable(BaseTable): class ProviderTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
name = tables.Column( name = tables.Column(
linkify=True linkify=True
) )
@ -60,10 +56,6 @@ class ProviderTable(BaseTable):
class ProviderNetworkTable(BaseTable): class ProviderNetworkTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
name = tables.Column( name = tables.Column(
linkify=True linkify=True
) )
@ -87,10 +79,6 @@ class ProviderNetworkTable(BaseTable):
class CircuitTypeTable(BaseTable): class CircuitTypeTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
name = tables.Column( name = tables.Column(
linkify=True linkify=True
) )

4
netbox/dcim/tables/cables.py
View File

@ -16,10 +16,6 @@ __all__ = (
class CableTable(BaseTable): class CableTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name='ID'
)
termination_a_parent = tables.TemplateColumn( termination_a_parent = tables.TemplateColumn(
template_code=CABLE_TERMINATION_PARENT, template_code=CABLE_TERMINATION_PARENT,
accessor=Accessor('termination_a'), accessor=Accessor('termination_a'),

20
netbox/dcim/tables/devices.py
View File

@ -69,10 +69,6 @@ def get_interface_state_attribute(record):
class DeviceRoleTable(BaseTable): class DeviceRoleTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name='ID'
)
name = tables.Column( name = tables.Column(
linkify=True linkify=True
) )
@ -102,10 +98,6 @@ class DeviceRoleTable(BaseTable):
class PlatformTable(BaseTable): class PlatformTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name='ID'
)
name = tables.Column( name = tables.Column(
linkify=True linkify=True
) )
@ -138,10 +130,6 @@ class PlatformTable(BaseTable):
class DeviceTable(BaseTable): class DeviceTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
name = tables.TemplateColumn( name = tables.TemplateColumn(
order_by=('_name',), order_by=('_name',),
template_code=DEVICE_LINK template_code=DEVICE_LINK
@ -249,10 +237,6 @@ class DeviceImportTable(BaseTable):
class DeviceComponentTable(BaseTable): class DeviceComponentTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name='ID'
)
device = tables.Column( device = tables.Column(
linkify=True linkify=True
) )
@ -762,10 +746,6 @@ class DeviceInventoryItemTable(InventoryItemTable):
class VirtualChassisTable(BaseTable): class VirtualChassisTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name='ID'
)
name = tables.Column( name = tables.Column(
linkify=True linkify=True
) )

8
netbox/dcim/tables/devicetypes.py
View File

@ -28,10 +28,6 @@ __all__ = (
class ManufacturerTable(BaseTable): class ManufacturerTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name='ID'
)
name = tables.Column( name = tables.Column(
linkify=True linkify=True
) )
@ -63,10 +59,6 @@ class ManufacturerTable(BaseTable):
class DeviceTypeTable(BaseTable): class DeviceTypeTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name='ID'
)
model = tables.Column( model = tables.Column(
linkify=True, linkify=True,
verbose_name='Device Type' verbose_name='Device Type'

8
netbox/dcim/tables/power.py
View File

@ -16,10 +16,6 @@ __all__ = (
class PowerPanelTable(BaseTable): class PowerPanelTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
name = tables.Column( name = tables.Column(
linkify=True linkify=True
) )
@ -49,10 +45,6 @@ class PowerPanelTable(BaseTable):
# cannot traverse pass-through ports. # cannot traverse pass-through ports.
class PowerFeedTable(CableTerminationTable): class PowerFeedTable(CableTerminationTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
name = tables.Column( name = tables.Column(
linkify=True linkify=True
) )

12
netbox/dcim/tables/racks.py
View File

@ -21,10 +21,6 @@ __all__ = (
class RackRoleTable(BaseTable): class RackRoleTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
name = tables.Column(linkify=True) name = tables.Column(linkify=True)
rack_count = tables.Column(verbose_name='Racks') rack_count = tables.Column(verbose_name='Racks')
color = ColorColumn() color = ColorColumn()
@ -42,10 +38,6 @@ class RackRoleTable(BaseTable):
class RackTable(BaseTable): class RackTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
name = tables.Column( name = tables.Column(
order_by=('_name',), order_by=('_name',),
linkify=True linkify=True
@ -99,10 +91,6 @@ class RackTable(BaseTable):
class RackReservationTable(BaseTable): class RackReservationTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
reservation = tables.Column( reservation = tables.Column(
accessor='pk', accessor='pk',
linkify=True linkify=True

16
netbox/dcim/tables/sites.py
View File

@ -21,10 +21,6 @@ __all__ = (
class RegionTable(BaseTable): class RegionTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
name = MPTTColumn( name = MPTTColumn(
linkify=True linkify=True
) )
@ -47,10 +43,6 @@ class RegionTable(BaseTable):
class SiteGroupTable(BaseTable): class SiteGroupTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
name = MPTTColumn( name = MPTTColumn(
linkify=True linkify=True
) )
@ -73,10 +65,6 @@ class SiteGroupTable(BaseTable):
class SiteTable(BaseTable): class SiteTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
name = tables.Column( name = tables.Column(
linkify=True linkify=True
) )
@ -109,10 +97,6 @@ class SiteTable(BaseTable):
class LocationTable(BaseTable): class LocationTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
name = MPTTColumn( name = MPTTColumn(
linkify=True linkify=True
) )

32
netbox/extras/tables.py
View File

@ -48,10 +48,6 @@ OBJECTCHANGE_REQUEST_ID = """
class CustomFieldTable(BaseTable): class CustomFieldTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
name = tables.Column( name = tables.Column(
linkify=True linkify=True
) )
@ -73,10 +69,6 @@ class CustomFieldTable(BaseTable):
class CustomLinkTable(BaseTable): class CustomLinkTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
name = tables.Column( name = tables.Column(
linkify=True linkify=True
) )
@ -98,10 +90,6 @@ class CustomLinkTable(BaseTable):
class ExportTemplateTable(BaseTable): class ExportTemplateTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
name = tables.Column( name = tables.Column(
linkify=True linkify=True
) )
@ -124,10 +112,6 @@ class ExportTemplateTable(BaseTable):
class WebhookTable(BaseTable): class WebhookTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
name = tables.Column( name = tables.Column(
linkify=True linkify=True
) )
@ -164,10 +148,6 @@ class WebhookTable(BaseTable):
class TagTable(BaseTable): class TagTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
name = tables.Column( name = tables.Column(
linkify=True linkify=True
) )
@ -197,10 +177,6 @@ class TaggedItemTable(BaseTable):
class ConfigContextTable(BaseTable): class ConfigContextTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
name = tables.Column( name = tables.Column(
linkify=True linkify=True
) )
@ -218,10 +194,6 @@ class ConfigContextTable(BaseTable):
class ObjectChangeTable(BaseTable): class ObjectChangeTable(BaseTable):
id = tables.Column(
linkify=True,
verbose_name="ID"
)
time = tables.DateTimeColumn( time = tables.DateTimeColumn(
linkify=True, linkify=True,
format=settings.SHORT_DATETIME_FORMAT format=settings.SHORT_DATETIME_FORMAT
@ -268,10 +240,6 @@ class ObjectJournalTable(BaseTable):
class JournalEntryTable(ObjectJournalTable): class JournalEntryTable(ObjectJournalTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
assigned_object_type = ContentTypeColumn( assigned_object_type = ContentTypeColumn(
verbose_name='Object type' verbose_name='Object type'
) )

24
netbox/ipam/tables/ip.py
View File

@ -74,10 +74,6 @@ VRF_LINK = """
class RIRTable(BaseTable): class RIRTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
name = tables.Column( name = tables.Column(
linkify=True linkify=True
) )
@ -103,10 +99,6 @@ class RIRTable(BaseTable):
class AggregateTable(BaseTable): class AggregateTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
prefix = tables.Column( prefix = tables.Column(
linkify=True, linkify=True,
verbose_name='Aggregate' verbose_name='Aggregate'
@ -139,10 +131,6 @@ class AggregateTable(BaseTable):
class RoleTable(BaseTable): class RoleTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
name = tables.Column( name = tables.Column(
linkify=True linkify=True
) )
@ -185,10 +173,6 @@ class PrefixUtilizationColumn(UtilizationColumn):
class PrefixTable(BaseTable): class PrefixTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
prefix = tables.TemplateColumn( prefix = tables.TemplateColumn(
template_code=PREFIX_LINK, template_code=PREFIX_LINK,
attrs={'td': {'class': 'text-nowrap'}} attrs={'td': {'class': 'text-nowrap'}}
@ -262,10 +246,6 @@ class PrefixTable(BaseTable):
# #
class IPRangeTable(BaseTable): class IPRangeTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
start_address = tables.Column( start_address = tables.Column(
linkify=True linkify=True
) )
@ -305,10 +285,6 @@ class IPRangeTable(BaseTable):
class IPAddressTable(BaseTable): class IPAddressTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
address = tables.TemplateColumn( address = tables.TemplateColumn(
template_code=IPADDRESS_LINK, template_code=IPADDRESS_LINK,
verbose_name='IP Address' verbose_name='IP Address'

4
netbox/ipam/tables/services.py
View File

@ -14,10 +14,6 @@ __all__ = (
class ServiceTable(BaseTable): class ServiceTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
name = tables.Column( name = tables.Column(
linkify=True linkify=True
) )

8
netbox/ipam/tables/vlans.py
View File

@ -63,10 +63,6 @@ VLAN_MEMBER_TAGGED = """
class VLANGroupTable(BaseTable): class VLANGroupTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
name = tables.Column(linkify=True) name = tables.Column(linkify=True)
scope_type = ContentTypeColumn() scope_type = ContentTypeColumn()
scope = tables.Column( scope = tables.Column(
@ -95,10 +91,6 @@ class VLANGroupTable(BaseTable):
class VLANTable(BaseTable): class VLANTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
vid = tables.TemplateColumn( vid = tables.TemplateColumn(
template_code=VLAN_LINK, template_code=VLAN_LINK,
verbose_name='ID' verbose_name='ID'

8
netbox/ipam/tables/vrfs.py
View File

@ -22,10 +22,6 @@ VRF_TARGETS = """
class VRFTable(BaseTable): class VRFTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
name = tables.Column( name = tables.Column(
linkify=True linkify=True
) )
@ -62,10 +58,6 @@ class VRFTable(BaseTable):
class RouteTargetTable(BaseTable): class RouteTargetTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
name = tables.Column( name = tables.Column(
linkify=True linkify=True
) )

8
netbox/tenancy/tables.py
View File

@ -43,10 +43,6 @@ class TenantColumn(tables.TemplateColumn):
class TenantGroupTable(BaseTable): class TenantGroupTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
name = MPTTColumn( name = MPTTColumn(
linkify=True linkify=True
) )
@ -69,10 +65,6 @@ class TenantGroupTable(BaseTable):
class TenantTable(BaseTable): class TenantTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
name = tables.Column( name = tables.Column(
linkify=True linkify=True
) )

5
netbox/utilities/tables.py
View File

@ -133,6 +133,11 @@ class BaseTable(tables.Table):
self._objects_count = sum(1 for obj in self.data if hasattr(obj, 'pk')) self._objects_count = sum(1 for obj in self.data if hasattr(obj, 'pk'))
return self._objects_count return self._objects_count
id = tables.Column(
linkify=True,
verbose_name='ID'
)
# #
# Table columns # Table columns

20
netbox/virtualization/tables.py
View File

@ -34,10 +34,6 @@ VMINTERFACE_BUTTONS = """
class ClusterTypeTable(BaseTable): class ClusterTypeTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
name = tables.Column( name = tables.Column(
linkify=True linkify=True
) )
@ -58,10 +54,6 @@ class ClusterTypeTable(BaseTable):
class ClusterGroupTable(BaseTable): class ClusterGroupTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
name = tables.Column( name = tables.Column(
linkify=True linkify=True
) )
@ -82,10 +74,6 @@ class ClusterGroupTable(BaseTable):
class ClusterTable(BaseTable): class ClusterTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
name = tables.Column( name = tables.Column(
linkify=True linkify=True
) )
@ -122,10 +110,6 @@ class ClusterTable(BaseTable):
class VirtualMachineTable(BaseTable): class VirtualMachineTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
name = tables.Column( name = tables.Column(
linkify=True linkify=True
) )
@ -170,10 +154,6 @@ class VirtualMachineTable(BaseTable):
class VMInterfaceTable(BaseInterfaceTable): class VMInterfaceTable(BaseInterfaceTable):
pk = ToggleColumn() pk = ToggleColumn()
id = tables.Column(
linkify=True,
verbose_name="ID"
)
virtual_machine = tables.Column( virtual_machine = tables.Column(
linkify=True linkify=True
) )