From b1cfbbc472ed998f304a30db04c9d7f2996df499 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Mon, 6 May 2024 09:40:36 -0400
Subject: [PATCH] Fixes #15960: Use internal ManyToManyColumn to ensure proper
 export behavior

---
 netbox/dcim/tables/devices.py | 2 +-
 netbox/ipam/tables/ip.py      | 2 +-
 netbox/vpn/tables/crypto.py   | 4 ++--
 netbox/vpn/tables/tunnels.py  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/netbox/dcim/tables/devices.py b/netbox/dcim/tables/devices.py
index 800b55bf1..169631506 100644
--- a/netbox/dcim/tables/devices.py
+++ b/netbox/dcim/tables/devices.py
@@ -618,7 +618,7 @@ class InterfaceTable(ModularDeviceComponentTable, BaseInterfaceTable, PathEndpoi
         verbose_name=_('VRF'),
         linkify=True
     )
-    inventory_items = tables.ManyToManyColumn(
+    inventory_items = columns.ManyToManyColumn(
         linkify_item=True,
         verbose_name=_('Inventory Items'),
     )
diff --git a/netbox/ipam/tables/ip.py b/netbox/ipam/tables/ip.py
index 3b50b257d..8d25e5068 100644
--- a/netbox/ipam/tables/ip.py
+++ b/netbox/ipam/tables/ip.py
@@ -378,7 +378,7 @@ class IPAddressTable(TenancyColumnsMixin, NetBoxTable):
         orderable=False,
         verbose_name=_('NAT (Inside)')
     )
-    nat_outside = tables.ManyToManyColumn(
+    nat_outside = columns.ManyToManyColumn(
         linkify_item=True,
         orderable=False,
         verbose_name=_('NAT (Outside)')
diff --git a/netbox/vpn/tables/crypto.py b/netbox/vpn/tables/crypto.py
index 5e102db24..474062b39 100644
--- a/netbox/vpn/tables/crypto.py
+++ b/netbox/vpn/tables/crypto.py
@@ -63,7 +63,7 @@ class IKEPolicyTable(NetBoxTable):
     mode = tables.Column(
         verbose_name=_('Mode')
     )
-    proposals = tables.ManyToManyColumn(
+    proposals = columns.ManyToManyColumn(
         linkify_item=True,
         verbose_name=_('Proposals')
     )
@@ -129,7 +129,7 @@ class IPSecPolicyTable(NetBoxTable):
         verbose_name=_('Name'),
         linkify=True
     )
-    proposals = tables.ManyToManyColumn(
+    proposals = columns.ManyToManyColumn(
         linkify_item=True,
         verbose_name=_('Proposals')
     )
diff --git a/netbox/vpn/tables/tunnels.py b/netbox/vpn/tables/tunnels.py
index cf4230652..94f65e573 100644
--- a/netbox/vpn/tables/tunnels.py
+++ b/netbox/vpn/tables/tunnels.py
@@ -91,7 +91,7 @@ class TunnelTerminationTable(TenancyColumnsMixin, NetBoxTable):
         verbose_name=_('Tunnel interface'),
         linkify=True
     )
-    ip_addresses = tables.ManyToManyColumn(
+    ip_addresses = columns.ManyToManyColumn(
         accessor=tables.A('termination__ip_addresses'),
         orderable=False,
         linkify_item=True,