Convert all LinkColumns to Column(linkify=True)

This commit is contained in:
jeremystretch
2021-04-02 16:59:53 -04:00
parent ea9e9d7273
commit 779837389b
11 changed files with 80 additions and 42 deletions

View File

@@ -26,9 +26,10 @@ class CableTable(BaseTable):
orderable=False,
verbose_name='Side A'
)
termination_a = tables.LinkColumn(
termination_a = tables.Column(
accessor=Accessor('termination_a'),
orderable=False,
linkify=True,
verbose_name='Termination A'
)
termination_b_parent = tables.TemplateColumn(
@@ -37,9 +38,10 @@ class CableTable(BaseTable):
orderable=False,
verbose_name='Side B'
)
termination_b = tables.LinkColumn(
termination_b = tables.Column(
accessor=Accessor('termination_b'),
orderable=False,
linkify=True,
verbose_name='Termination B'
)
status = ChoiceFieldColumn()

View File

@@ -137,11 +137,9 @@ class DeviceTable(BaseTable):
device_role = ColoredLabelColumn(
verbose_name='Role'
)
device_type = tables.LinkColumn(
viewname='dcim:devicetype',
args=[Accessor('device_type__pk')],
verbose_name='Type',
text=lambda record: record.device_type.display_name
device_type = tables.Column(
linkify=True,
verbose_name='Type'
)
if settings.PREFER_IPV4:
primary_ip = tables.Column(
@@ -163,13 +161,11 @@ class DeviceTable(BaseTable):
linkify=True,
verbose_name='IPv6 Address'
)
cluster = tables.LinkColumn(
viewname='virtualization:cluster',
args=[Accessor('cluster__pk')]
cluster = tables.Column(
linkify=True
)
virtual_chassis = tables.LinkColumn(
viewname='dcim:virtualchassis',
args=[Accessor('virtual_chassis__pk')]
virtual_chassis = tables.Column(
linkify=True
)
vc_position = tables.Column(
verbose_name='VC Position'

View File

@@ -26,7 +26,9 @@ __all__ = (
class ManufacturerTable(BaseTable):
pk = ToggleColumn()
name = tables.LinkColumn()
name = tables.Column(
linkify=True
)
devicetype_count = tables.Column(
verbose_name='Device Types'
)

View File

@@ -16,7 +16,9 @@ __all__ = (
class PowerPanelTable(BaseTable):
pk = ToggleColumn()
name = tables.LinkColumn()
name = tables.Column(
linkify=True
)
site = tables.Column(
linkify=True
)
@@ -43,7 +45,9 @@ class PowerPanelTable(BaseTable):
# cannot traverse pass-through ports.
class PowerFeedTable(CableTerminationTable):
pk = ToggleColumn()
name = tables.LinkColumn()
name = tables.Column(
linkify=True
)
power_panel = tables.Column(
linkify=True
)

View File

@@ -57,8 +57,8 @@ class SiteGroupTable(BaseTable):
class SiteTable(BaseTable):
pk = ToggleColumn()
name = tables.LinkColumn(
order_by=('_name',)
name = tables.Column(
linkify=True
)
status = ChoiceFieldColumn()
region = tables.Column(