From 03b3f5937f49324db0639c73d5242cd0e9c2a548 Mon Sep 17 00:00:00 2001
From: jeremystretch <jeremy@netverity.dev>
Date: Thu, 8 Apr 2021 13:50:06 -0400
Subject: [PATCH] Fixes #6108: Do not infer tenant assignment from parent
 objects for prefixes, IP addresses

---
 docs/release-notes/version-2.10.md |  1 +
 netbox/ipam/tables.py              | 28 ++++++++--------------------
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/docs/release-notes/version-2.10.md b/docs/release-notes/version-2.10.md
index f895e43f7..36c9d3276 100644
--- a/docs/release-notes/version-2.10.md
+++ b/docs/release-notes/version-2.10.md
@@ -14,6 +14,7 @@
 * [#5805](https://github.com/netbox-community/netbox/issues/5805) - Fix missing custom field filters for cables, rack reservations
 * [#6073](https://github.com/netbox-community/netbox/issues/6073) - Permit users to manage their own REST API tokens without needing explicit permission
 * [#6081](https://github.com/netbox-community/netbox/issues/6081) - Fix interface connections REST API endpoint
+* [#6108](https://github.com/netbox-community/netbox/issues/6108) - Do not infer tenant assignment from parent objects for prefixes, IP addresses
 
 ---
 
diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py
index 04a5d130c..b16e180bd 100644
--- a/netbox/ipam/tables.py
+++ b/netbox/ipam/tables.py
@@ -109,18 +109,6 @@ VLAN_MEMBER_TAGGED = """
 {% endif %}
 """
 
-TENANT_LINK = """
-{% if record.tenant %}
-    <a href="{% url 'tenancy:tenant' slug=record.tenant.slug %}" title="{{ record.tenant.description }}">{{ record.tenant }}</a>
-{% elif record.vrf.tenant %}
-    <a href="{% url 'tenancy:tenant' slug=record.vrf.tenant.slug %}" title="{{ record.vrf.tenant.description }}">{{ record.vrf.tenant }}</a>*
-{% elif object.tenant %}
-    <a href="{% url 'tenancy:tenant' slug=object.tenant.slug %}" title="{{ object.tenant.description }}">{{ object.tenant }}</a>
-{% else %}
-    &mdash;
-{% endif %}
-"""
-
 
 #
 # VRFs
@@ -210,8 +198,8 @@ class AggregateTable(BaseTable):
     prefix = tables.LinkColumn(
         verbose_name='Aggregate'
     )
-    tenant = tables.TemplateColumn(
-        template_code=TENANT_LINK
+    tenant = tables.Column(
+        linkify=True
     )
     date_added = tables.DateColumn(
         format="Y-m-d",
@@ -281,8 +269,8 @@ class PrefixTable(BaseTable):
         template_code=VRF_LINK,
         verbose_name='VRF'
     )
-    tenant = tables.TemplateColumn(
-        template_code=TENANT_LINK
+    tenant = tables.Column(
+        linkify=True
     )
     site = tables.Column(
         linkify=True
@@ -349,8 +337,8 @@ class IPAddressTable(BaseTable):
         default=AVAILABLE_LABEL
     )
     role = ChoiceFieldColumn()
-    tenant = tables.TemplateColumn(
-        template_code=TENANT_LINK
+    tenant = tables.Column(
+        linkify=True
     )
     assigned_object = tables.Column(
         linkify=True,
@@ -430,8 +418,8 @@ class InterfaceIPAddressTable(BaseTable):
         verbose_name='VRF'
     )
     status = ChoiceFieldColumn()
-    tenant = tables.TemplateColumn(
-        template_code=TENANT_LINK
+    tenant = tables.Column(
+        linkify=True
     )
     actions = ButtonsColumn(
         model=IPAddress