10655 fix contacts display in list views (#10681)

arthanson · web-flow · commit 2fe8df3cbb6f · 2022-10-18T16:47:14.000-04:00
* 10655 fix contacts display in list views

* 10655 review changes
diff --git a/netbox/circuits/tables/circuits.py b/netbox/circuits/tables/circuits.py
@@ -1,8 +1,9 @@
 import django_tables2 as tables
-
 from circuits.models import *
+from tenancy.tables import ContactsColumnMixin, TenancyColumnsMixin
+
 from netbox.tables import NetBoxTable, columns
-from tenancy.tables import TenancyColumnsMixin
+
 from .columns import CommitRateColumn
 
 __all__ = (
@@ -39,7 +40,7 @@ class Meta(NetBoxTable.Meta):
         default_columns = ('pk', 'name', 'circuit_count', 'description', 'slug')
 
 
-class CircuitTable(TenancyColumnsMixin, NetBoxTable):
+class CircuitTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable):
     cid = tables.Column(
         linkify=True,
         verbose_name='Circuit ID'
@@ -58,9 +59,6 @@ class CircuitTable(TenancyColumnsMixin, NetBoxTable):
     )
     commit_rate = CommitRateColumn()
     comments = columns.MarkdownColumn()
-    contacts = columns.ManyToManyColumn(
-        linkify_item=True
-    )
     tags = columns.TagColumn(
         url_name='circuits:circuit_list'
     )
diff --git a/netbox/circuits/tables/providers.py b/netbox/circuits/tables/providers.py
@@ -1,7 +1,8 @@
 import django_tables2 as tables
+from circuits.models import *
 from django_tables2.utils import Accessor
+from tenancy.tables import ContactsColumnMixin
 
-from circuits.models import *
 from netbox.tables import NetBoxTable, columns
 
 __all__ = (
@@ -10,7 +11,7 @@
 )
 
 
-class ProviderTable(NetBoxTable):
+class ProviderTable(ContactsColumnMixin, NetBoxTable):
     name = tables.Column(
         linkify=True
     )
@@ -31,9 +32,6 @@ class ProviderTable(NetBoxTable):
         verbose_name='Circuits'
     )
     comments = columns.MarkdownColumn()
-    contacts = columns.ManyToManyColumn(
-        linkify_item=True
-    )
     tags = columns.TagColumn(
         url_name='circuits:provider_list'
     )
diff --git a/netbox/dcim/tables/devices.py b/netbox/dcim/tables/devices.py
@@ -1,12 +1,26 @@
 import django_tables2 as tables
-from django_tables2.utils import Accessor
-
 from dcim.models import (
-    ConsolePort, ConsoleServerPort, Device, DeviceBay, DeviceRole, FrontPort, Interface, InventoryItem,
-    InventoryItemRole, ModuleBay, Platform, PowerOutlet, PowerPort, RearPort, VirtualChassis,
+    ConsolePort,
+    ConsoleServerPort,
+    Device,
+    DeviceBay,
+    DeviceRole,
+    FrontPort,
+    Interface,
+    InventoryItem,
+    InventoryItemRole,
+    ModuleBay,
+    Platform,
+    PowerOutlet,
+    PowerPort,
+    RearPort,
+    VirtualChassis,
 )
+from django_tables2.utils import Accessor
+from tenancy.tables import ContactsColumnMixin, TenancyColumnsMixin
+
 from netbox.tables import NetBoxTable, columns
-from tenancy.tables import TenancyColumnsMixin
+
 from .template_code import *
 
 __all__ = (
@@ -137,7 +151,7 @@ class Meta(NetBoxTable.Meta):
 # Devices
 #
 
-class DeviceTable(TenancyColumnsMixin, NetBoxTable):
+class DeviceTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable):
     name = tables.TemplateColumn(
         order_by=('_name',),
         template_code=DEVICE_LINK
@@ -201,9 +215,6 @@ class DeviceTable(TenancyColumnsMixin, NetBoxTable):
         verbose_name='VC Priority'
     )
     comments = columns.MarkdownColumn()
-    contacts = columns.ManyToManyColumn(
-        linkify_item=True
-    )
     tags = columns.TagColumn(
         url_name='dcim:device_list'
     )
diff --git a/netbox/dcim/tables/devicetypes.py b/netbox/dcim/tables/devicetypes.py
@@ -1,10 +1,22 @@
 import django_tables2 as tables
-
 from dcim.models import (
-    ConsolePortTemplate, ConsoleServerPortTemplate, DeviceBayTemplate, DeviceType, FrontPortTemplate, InterfaceTemplate,
-    InventoryItemTemplate, Manufacturer, ModuleBayTemplate, PowerOutletTemplate, PowerPortTemplate, RearPortTemplate,
+    ConsolePortTemplate,
+    ConsoleServerPortTemplate,
+    DeviceBayTemplate,
+    DeviceType,
+    FrontPortTemplate,
+    InterfaceTemplate,
+    InventoryItemTemplate,
+    Manufacturer,
+    ModuleBayTemplate,
+    PowerOutletTemplate,
+    PowerPortTemplate,
+    RearPortTemplate,
 )
+from tenancy.tables import ContactsColumnMixin
+
 from netbox.tables import NetBoxTable, columns
+
 from .template_code import MODULAR_COMPONENT_TEMPLATE_BUTTONS
 
 __all__ = (
@@ -27,7 +39,7 @@
 # Manufacturers
 #
 
-class ManufacturerTable(NetBoxTable):
+class ManufacturerTable(ContactsColumnMixin, NetBoxTable):
     name = tables.Column(
         linkify=True
     )
@@ -43,9 +55,6 @@ class ManufacturerTable(NetBoxTable):
         verbose_name='Platforms'
     )
     slug = tables.Column()
-    contacts = columns.ManyToManyColumn(
-        linkify_item=True
-    )
     tags = columns.TagColumn(
         url_name='dcim:manufacturer_list'
     )
diff --git a/netbox/dcim/tables/power.py b/netbox/dcim/tables/power.py
@@ -1,7 +1,9 @@
 import django_tables2 as tables
-
 from dcim.models import PowerFeed, PowerPanel
+from tenancy.tables import ContactsColumnMixin
+
 from netbox.tables import NetBoxTable, columns
+
 from .devices import CableTerminationTable
 
 __all__ = (
@@ -14,7 +16,7 @@
 # Power panels
 #
 
-class PowerPanelTable(NetBoxTable):
+class PowerPanelTable(ContactsColumnMixin, NetBoxTable):
     name = tables.Column(
         linkify=True
     )
@@ -29,9 +31,6 @@ class PowerPanelTable(NetBoxTable):
         url_params={'power_panel_id': 'pk'},
         verbose_name='Feeds'
     )
-    contacts = columns.ManyToManyColumn(
-        linkify_item=True
-    )
     tags = columns.TagColumn(
         url_name='dcim:powerpanel_list'
     )
diff --git a/netbox/dcim/tables/racks.py b/netbox/dcim/tables/racks.py
@@ -1,9 +1,9 @@
 import django_tables2 as tables
+from dcim.models import Rack, RackReservation, RackRole
 from django_tables2.utils import Accessor
+from tenancy.tables import ContactsColumnMixin, TenancyColumnsMixin
 
-from dcim.models import Rack, RackReservation, RackRole
 from netbox.tables import NetBoxTable, columns
-from tenancy.tables import TenancyColumnsMixin
 
 __all__ = (
     'RackTable',
@@ -37,7 +37,7 @@ class Meta(NetBoxTable.Meta):
 # Racks
 #
 
-class RackTable(TenancyColumnsMixin, NetBoxTable):
+class RackTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable):
     name = tables.Column(
         order_by=('_name',),
         linkify=True
@@ -68,9 +68,6 @@ class RackTable(TenancyColumnsMixin, NetBoxTable):
         orderable=False,
         verbose_name='Power'
     )
-    contacts = columns.ManyToManyColumn(
-        linkify_item=True
-    )
     tags = columns.TagColumn(
         url_name='dcim:rack_list'
     )
diff --git a/netbox/dcim/tables/sites.py b/netbox/dcim/tables/sites.py
@@ -1,8 +1,9 @@
 import django_tables2 as tables
-
 from dcim.models import Location, Region, Site, SiteGroup
+from tenancy.tables import ContactsColumnMixin, TenancyColumnsMixin
+
 from netbox.tables import NetBoxTable, columns
-from tenancy.tables import TenancyColumnsMixin
+
 from .template_code import LOCATION_BUTTONS
 
 __all__ = (
@@ -17,7 +18,7 @@
 # Regions
 #
 
-class RegionTable(NetBoxTable):
+class RegionTable(ContactsColumnMixin, NetBoxTable):
     name = columns.MPTTColumn(
         linkify=True
     )
@@ -26,9 +27,6 @@ class RegionTable(NetBoxTable):
         url_params={'region_id': 'pk'},
         verbose_name='Sites'
     )
-    contacts = columns.ManyToManyColumn(
-        linkify_item=True
-    )
     tags = columns.TagColumn(
         url_name='dcim:region_list'
     )
@@ -46,7 +44,7 @@ class Meta(NetBoxTable.Meta):
 # Site groups
 #
 
-class SiteGroupTable(NetBoxTable):
+class SiteGroupTable(ContactsColumnMixin, NetBoxTable):
     name = columns.MPTTColumn(
         linkify=True
     )
@@ -55,9 +53,6 @@ class SiteGroupTable(NetBoxTable):
         url_params={'group_id': 'pk'},
         verbose_name='Sites'
     )
-    contacts = columns.ManyToManyColumn(
-        linkify_item=True
-    )
     tags = columns.TagColumn(
         url_name='dcim:sitegroup_list'
     )
@@ -75,7 +70,7 @@ class Meta(NetBoxTable.Meta):
 # Sites
 #
 
-class SiteTable(TenancyColumnsMixin, NetBoxTable):
+class SiteTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable):
     name = tables.Column(
         linkify=True
     )
@@ -97,9 +92,6 @@ class SiteTable(TenancyColumnsMixin, NetBoxTable):
         verbose_name='ASN Count'
     )
     comments = columns.MarkdownColumn()
-    contacts = columns.ManyToManyColumn(
-        linkify_item=True
-    )
     tags = columns.TagColumn(
         url_name='dcim:site_list'
     )
@@ -118,7 +110,7 @@ class Meta(NetBoxTable.Meta):
 # Locations
 #
 
-class LocationTable(TenancyColumnsMixin, NetBoxTable):
+class LocationTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable):
     name = columns.MPTTColumn(
         linkify=True
     )
@@ -136,9 +128,6 @@ class LocationTable(TenancyColumnsMixin, NetBoxTable):
         url_params={'location_id': 'pk'},
         verbose_name='Devices'
     )
-    contacts = columns.ManyToManyColumn(
-        linkify_item=True
-    )
     tags = columns.TagColumn(
         url_name='dcim:location_list'
     )
diff --git a/netbox/tenancy/tables/columns.py b/netbox/tenancy/tables/columns.py
@@ -1,6 +1,9 @@
 import django_tables2 as tables
 
+from netbox.tables import columns
+
 __all__ = (
+    'ContactsColumnMixin',
     'TenantColumn',
     'TenantGroupColumn',
     'TenancyColumnsMixin',
@@ -55,3 +58,10 @@ def value(self, value):
 class TenancyColumnsMixin(tables.Table):
     tenant_group = TenantGroupColumn()
     tenant = TenantColumn()
+
+
+class ContactsColumnMixin(tables.Table):
+    contacts = columns.ManyToManyColumn(
+        linkify_item=True,
+        transform=lambda obj: obj.contact.name
+    )
diff --git a/netbox/tenancy/tables/tenants.py b/netbox/tenancy/tables/tenants.py
@@ -1,7 +1,8 @@
 import django_tables2 as tables
+from tenancy.models import *
+from tenancy.tables import ContactsColumnMixin
 
 from netbox.tables import NetBoxTable, columns
-from tenancy.models import *
 
 __all__ = (
     'TenantGroupTable',
@@ -30,17 +31,14 @@ class Meta(NetBoxTable.Meta):
         default_columns = ('pk', 'name', 'tenant_count', 'description')
 
 
-class TenantTable(NetBoxTable):
+class TenantTable(ContactsColumnMixin, NetBoxTable):
     name = tables.Column(
         linkify=True
     )
     group = tables.Column(
         linkify=True
     )
     comments = columns.MarkdownColumn()
-    contacts = columns.ManyToManyColumn(
-        linkify_item=True
-    )
     tags = columns.TagColumn(
         url_name='tenancy:contact_list'
     )
diff --git a/netbox/virtualization/tables/clusters.py b/netbox/virtualization/tables/clusters.py
diff --git a/netbox/virtualization/tables/virtualmachines.py b/netbox/virtualization/tables/virtualmachines.py

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`import django_tables2 as tables`
	`2`	`+from circuits.models import *`
`2`	`3`	`from django_tables2.utils import Accessor`
	`4`	`+from tenancy.tables import ContactsColumnMixin`
`3`	`5`
`4`		`-from circuits.models import *`
`5`	`6`	`from netbox.tables import NetBoxTable, columns`
`6`	`7`
`7`	`8`	`__all__ = (`
`@@ -10,7 +11,7 @@`
`10`	`11`	`)`
`11`	`12`
`12`	`13`
`13`		`-class ProviderTable(NetBoxTable):`
	`14`	`+class ProviderTable(ContactsColumnMixin, NetBoxTable):`
`14`	`15`	`name = tables.Column(`
`15`	`16`	`linkify=True`
`16`	`17`	`)`
`@@ -31,9 +32,6 @@ class ProviderTable(NetBoxTable):`
`31`	`32`	`verbose_name='Circuits'`
`32`	`33`	`)`
`33`	`34`	`comments = columns.MarkdownColumn()`
`34`		`- contacts = columns.ManyToManyColumn(`
`35`		`- linkify_item=True`
`36`		`- )`
`37`	`35`	`tags = columns.TagColumn(`
`38`	`36`	`url_name='circuits:provider_list'`
`39`	`37`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`import django_tables2 as tables`
`2`		`-`
`3`	`2`	`from dcim.models import Location, Region, Site, SiteGroup`
	`3`	`+from tenancy.tables import ContactsColumnMixin, TenancyColumnsMixin`
	`4`	`+`
`4`	`5`	`from netbox.tables import NetBoxTable, columns`
`5`		`-from tenancy.tables import TenancyColumnsMixin`
	`6`	`+`
`6`	`7`	`from .template_code import LOCATION_BUTTONS`
`7`	`8`
`8`	`9`	`__all__ = (`
`@@ -17,7 +18,7 @@`
`17`	`18`	`# Regions`
`18`	`19`	`#`
`19`	`20`
`20`		`-class RegionTable(NetBoxTable):`
	`21`	`+class RegionTable(ContactsColumnMixin, NetBoxTable):`
`21`	`22`	`name = columns.MPTTColumn(`
`22`	`23`	`linkify=True`
`23`	`24`	`)`
`@@ -26,9 +27,6 @@ class RegionTable(NetBoxTable):`
`26`	`27`	`url_params={'region_id': 'pk'},`
`27`	`28`	`verbose_name='Sites'`
`28`	`29`	`)`
`29`		`- contacts = columns.ManyToManyColumn(`
`30`		`- linkify_item=True`
`31`		`- )`
`32`	`30`	`tags = columns.TagColumn(`
`33`	`31`	`url_name='dcim:region_list'`
`34`	`32`	`)`
`@@ -46,7 +44,7 @@ class Meta(NetBoxTable.Meta):`
`46`	`44`	`# Site groups`
`47`	`45`	`#`
`48`	`46`
`49`		`-class SiteGroupTable(NetBoxTable):`
	`47`	`+class SiteGroupTable(ContactsColumnMixin, NetBoxTable):`
`50`	`48`	`name = columns.MPTTColumn(`
`51`	`49`	`linkify=True`
`52`	`50`	`)`
`@@ -55,9 +53,6 @@ class SiteGroupTable(NetBoxTable):`
`55`	`53`	`url_params={'group_id': 'pk'},`
`56`	`54`	`verbose_name='Sites'`
`57`	`55`	`)`
`58`		`- contacts = columns.ManyToManyColumn(`
`59`		`- linkify_item=True`
`60`		`- )`
`61`	`56`	`tags = columns.TagColumn(`
`62`	`57`	`url_name='dcim:sitegroup_list'`
`63`	`58`	`)`
`@@ -75,7 +70,7 @@ class Meta(NetBoxTable.Meta):`
`75`	`70`	`# Sites`
`76`	`71`	`#`
`77`	`72`
`78`		`-class SiteTable(TenancyColumnsMixin, NetBoxTable):`
	`73`	`+class SiteTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable):`
`79`	`74`	`name = tables.Column(`
`80`	`75`	`linkify=True`
`81`	`76`	`)`
`@@ -97,9 +92,6 @@ class SiteTable(TenancyColumnsMixin, NetBoxTable):`
`97`	`92`	`verbose_name='ASN Count'`
`98`	`93`	`)`
`99`	`94`	`comments = columns.MarkdownColumn()`
`100`		`- contacts = columns.ManyToManyColumn(`
`101`		`- linkify_item=True`
`102`		`- )`
`103`	`95`	`tags = columns.TagColumn(`
`104`	`96`	`url_name='dcim:site_list'`
`105`	`97`	`)`
`@@ -118,7 +110,7 @@ class Meta(NetBoxTable.Meta):`
`118`	`110`	`# Locations`
`119`	`111`	`#`
`120`	`112`
`121`		`-class LocationTable(TenancyColumnsMixin, NetBoxTable):`
	`113`	`+class LocationTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable):`
`122`	`114`	`name = columns.MPTTColumn(`
`123`	`115`	`linkify=True`
`124`	`116`	`)`
`@@ -136,9 +128,6 @@ class LocationTable(TenancyColumnsMixin, NetBoxTable):`
`136`	`128`	`url_params={'location_id': 'pk'},`
`137`	`129`	`verbose_name='Devices'`
`138`	`130`	`)`
`139`		`- contacts = columns.ManyToManyColumn(`
`140`		`- linkify_item=True`
`141`		`- )`
`142`	`131`	`tags = columns.TagColumn(`
`143`	`132`	`url_name='dcim:location_list'`
`144`	`133`	`)`