diff --git a/netbox/ipam/tables/ip.py b/netbox/ipam/tables/ip.py index ddad6c573..03f56fd81 100644 --- a/netbox/ipam/tables/ip.py +++ b/netbox/ipam/tables/ip.py @@ -74,6 +74,10 @@ VRF_LINK = """ class RIRTable(BaseTable): pk = ToggleColumn() + id = tables.Column( + linkify=True, + verbose_name="ID" + ) name = tables.Column( linkify=True ) @@ -89,7 +93,7 @@ class RIRTable(BaseTable): class Meta(BaseTable.Meta): model = RIR - fields = ('pk', 'name', 'slug', 'is_private', 'aggregate_count', 'description', 'actions') + fields = ('pk', 'id', 'name', 'slug', 'is_private', 'aggregate_count', 'description', 'actions') default_columns = ('pk', 'name', 'is_private', 'aggregate_count', 'description', 'actions') @@ -99,6 +103,10 @@ class RIRTable(BaseTable): class AggregateTable(BaseTable): pk = ToggleColumn() + id = tables.Column( + linkify=True, + verbose_name="ID" + ) prefix = tables.Column( linkify=True, verbose_name='Aggregate' @@ -121,7 +129,7 @@ class AggregateTable(BaseTable): class Meta(BaseTable.Meta): model = Aggregate - fields = ('pk', 'prefix', 'rir', 'tenant', 'child_count', 'utilization', 'date_added', 'description', 'tags') + fields = ('pk', 'id', 'prefix', 'rir', 'tenant', 'child_count', 'utilization', 'date_added', 'description', 'tags') default_columns = ('pk', 'prefix', 'rir', 'tenant', 'child_count', 'utilization', 'date_added', 'description') @@ -131,6 +139,10 @@ class AggregateTable(BaseTable): class RoleTable(BaseTable): pk = ToggleColumn() + id = tables.Column( + linkify=True, + verbose_name="ID" + ) name = tables.Column( linkify=True ) @@ -148,7 +160,7 @@ class RoleTable(BaseTable): class Meta(BaseTable.Meta): model = Role - fields = ('pk', 'name', 'slug', 'prefix_count', 'vlan_count', 'description', 'weight', 'actions') + fields = ('pk', 'id', 'name', 'slug', 'prefix_count', 'vlan_count', 'description', 'weight', 'actions') default_columns = ('pk', 'name', 'prefix_count', 'vlan_count', 'description', 'actions') @@ -173,6 +185,10 @@ class PrefixUtilizationColumn(UtilizationColumn): class PrefixTable(BaseTable): pk = ToggleColumn() + id = tables.Column( + linkify=True, + verbose_name="ID" + ) prefix = tables.TemplateColumn( template_code=PREFIX_LINK, attrs={'td': {'class': 'text-nowrap'}} @@ -230,7 +246,7 @@ class PrefixTable(BaseTable): class Meta(BaseTable.Meta): model = Prefix fields = ( - 'pk', 'prefix', 'prefix_flat', 'status', 'children', 'vrf', 'utilization', 'tenant', 'site', 'vlan', 'role', + 'pk', 'id', 'prefix', 'prefix_flat', 'status', 'children', 'vrf', 'utilization', 'tenant', 'site', 'vlan', 'role', 'is_pool', 'mark_utilized', 'description', 'tags', ) default_columns = ( @@ -246,6 +262,10 @@ class PrefixTable(BaseTable): # class IPRangeTable(BaseTable): pk = ToggleColumn() + id = tables.Column( + linkify=True, + verbose_name="ID" + ) start_address = tables.Column( linkify=True ) @@ -268,7 +288,7 @@ class IPRangeTable(BaseTable): class Meta(BaseTable.Meta): model = IPRange fields = ( - 'pk', 'start_address', 'end_address', 'size', 'vrf', 'status', 'role', 'tenant', 'description', + 'pk', 'id', 'start_address', 'end_address', 'size', 'vrf', 'status', 'role', 'tenant', 'description', 'utilization', ) default_columns = ( @@ -285,6 +305,10 @@ class IPRangeTable(BaseTable): class IPAddressTable(BaseTable): pk = ToggleColumn() + id = tables.Column( + linkify=True, + verbose_name="ID" + ) address = tables.TemplateColumn( template_code=IPADDRESS_LINK, verbose_name='IP Address' @@ -326,7 +350,7 @@ class IPAddressTable(BaseTable): class Meta(BaseTable.Meta): model = IPAddress fields = ( - 'pk', 'address', 'vrf', 'status', 'role', 'tenant', 'nat_inside', 'assigned', 'dns_name', 'description', + 'pk', 'id', 'address', 'vrf', 'status', 'role', 'tenant', 'nat_inside', 'assigned', 'dns_name', 'description', 'tags', ) default_columns = ( diff --git a/netbox/ipam/tables/services.py b/netbox/ipam/tables/services.py index 58c8ea49e..c254846fe 100644 --- a/netbox/ipam/tables/services.py +++ b/netbox/ipam/tables/services.py @@ -14,6 +14,10 @@ __all__ = ( class ServiceTable(BaseTable): pk = ToggleColumn() + id = tables.Column( + linkify=True, + verbose_name="ID" + ) name = tables.Column( linkify=True ) @@ -31,5 +35,5 @@ class ServiceTable(BaseTable): class Meta(BaseTable.Meta): model = Service - fields = ('pk', 'name', 'parent', 'protocol', 'ports', 'ipaddresses', 'description', 'tags') + fields = ('pk', 'id', 'name', 'parent', 'protocol', 'ports', 'ipaddresses', 'description', 'tags') default_columns = ('pk', 'name', 'parent', 'protocol', 'ports', 'description') diff --git a/netbox/ipam/tables/vlans.py b/netbox/ipam/tables/vlans.py index fd1e92be8..09f283cc2 100644 --- a/netbox/ipam/tables/vlans.py +++ b/netbox/ipam/tables/vlans.py @@ -63,6 +63,10 @@ VLAN_MEMBER_TAGGED = """ class VLANGroupTable(BaseTable): pk = ToggleColumn() + id = tables.Column( + linkify=True, + verbose_name="ID" + ) name = tables.Column(linkify=True) scope_type = ContentTypeColumn() scope = tables.Column( @@ -81,7 +85,7 @@ class VLANGroupTable(BaseTable): class Meta(BaseTable.Meta): model = VLANGroup - fields = ('pk', 'name', 'scope_type', 'scope', 'vlan_count', 'slug', 'description', 'actions') + fields = ('pk', 'id', 'name', 'scope_type', 'scope', 'vlan_count', 'slug', 'description', 'actions') default_columns = ('pk', 'name', 'scope_type', 'scope', 'vlan_count', 'description', 'actions') @@ -91,6 +95,10 @@ class VLANGroupTable(BaseTable): class VLANTable(BaseTable): pk = ToggleColumn() + id = tables.Column( + linkify=True, + verbose_name="ID" + ) vid = tables.TemplateColumn( template_code=VLAN_LINK, verbose_name='ID' @@ -119,7 +127,7 @@ class VLANTable(BaseTable): class Meta(BaseTable.Meta): model = VLAN - fields = ('pk', 'vid', 'name', 'site', 'group', 'prefixes', 'tenant', 'status', 'role', 'description', 'tags') + fields = ('pk', 'id', 'vid', 'name', 'site', 'group', 'prefixes', 'tenant', 'status', 'role', 'description', 'tags') default_columns = ('pk', 'vid', 'name', 'site', 'group', 'prefixes', 'tenant', 'status', 'role', 'description') row_attrs = { 'class': lambda record: 'success' if not isinstance(record, VLAN) else '', diff --git a/netbox/ipam/tables/vrfs.py b/netbox/ipam/tables/vrfs.py index 3a351a856..2b3b24caf 100644 --- a/netbox/ipam/tables/vrfs.py +++ b/netbox/ipam/tables/vrfs.py @@ -22,6 +22,10 @@ VRF_TARGETS = """ class VRFTable(BaseTable): pk = ToggleColumn() + id = tables.Column( + linkify=True, + verbose_name="ID" + ) name = tables.Column( linkify=True ) @@ -47,7 +51,7 @@ class VRFTable(BaseTable): class Meta(BaseTable.Meta): model = VRF fields = ( - 'pk', 'name', 'rd', 'tenant', 'enforce_unique', 'description', 'import_targets', 'export_targets', 'tags', + 'pk', 'id', 'name', 'rd', 'tenant', 'enforce_unique', 'description', 'import_targets', 'export_targets', 'tags', ) default_columns = ('pk', 'name', 'rd', 'tenant', 'description') @@ -58,6 +62,10 @@ class VRFTable(BaseTable): class RouteTargetTable(BaseTable): pk = ToggleColumn() + id = tables.Column( + linkify=True, + verbose_name="ID" + ) name = tables.Column( linkify=True ) @@ -68,5 +76,5 @@ class RouteTargetTable(BaseTable): class Meta(BaseTable.Meta): model = RouteTarget - fields = ('pk', 'name', 'tenant', 'description', 'tags') + fields = ('pk', 'id', 'name', 'tenant', 'description', 'tags') default_columns = ('pk', 'name', 'tenant', 'description')