From 5a5a7f3213e8416e177c3d51a9d518307836cf66 Mon Sep 17 00:00:00 2001
From: Arthur <worldnomad@gmail.com>
Date: Mon, 17 Mar 2025 13:45:25 -0700
Subject: [PATCH] 17178 review changes

---
 netbox/tenancy/tests/test_api.py   | 1 +
 netbox/tenancy/tests/test_views.py | 9 +++++----
 netbox/tenancy/views.py            | 2 --
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/netbox/tenancy/tests/test_api.py b/netbox/tenancy/tests/test_api.py
index 04ac3078c..3bacb8fea 100644
--- a/netbox/tenancy/tests/test_api.py
+++ b/netbox/tenancy/tests/test_api.py
@@ -195,6 +195,7 @@ class ContactTest(APIViewTestCases.APIViewTestCase):
         cls.create_data = [
             {
                 'name': 'Contact 4',
+                'groups': [contact_groups[1].pk],
             },
             {
                 'name': 'Contact 5',
diff --git a/netbox/tenancy/tests/test_views.py b/netbox/tenancy/tests/test_views.py
index 8136d03f1..ec962e6e6 100644
--- a/netbox/tenancy/tests/test_views.py
+++ b/netbox/tenancy/tests/test_views.py
@@ -215,16 +215,17 @@ class ContactTestCase(ViewTestCases.PrimaryObjectViewTestCase):
 
         cls.csv_data = (
             "name",
+            "groups",
             "Contact 4",
             "Contact 5",
             "Contact 6",
         )
 
         cls.csv_update_data = (
-            "id,name,comments",
-            f"{contacts[0].pk},Contact Group 7,New comments 7",
-            f"{contacts[1].pk},Contact Group 8,New comments 8",
-            f"{contacts[2].pk},Contact Group 9,New comments 9",
+            "id,name,groups,comments",
+            f'{contacts[0].pk},Contact 7,"Contact Group 1,Contact Group 2",New comments 7',
+            f'{contacts[1].pk},Contact 8,"Contact Group 1",New comments 8',
+            f'{contacts[2].pk},Contact 9,"Contact Group 1",New comments 9',
         )
 
         cls.bulk_edit_data = {
diff --git a/netbox/tenancy/views.py b/netbox/tenancy/views.py
index 477e64fd7..d0c80b76f 100644
--- a/netbox/tenancy/views.py
+++ b/netbox/tenancy/views.py
@@ -183,14 +183,12 @@ class ContactGroupListView(generic.ObjectListView):
 class ContactGroupView(GetRelatedModelsMixin, generic.ObjectView):
     queryset = ContactGroup.objects.all()
 
-    """
     def get_extra_context(self, request, instance):
         groups = instance.get_descendants(include_self=True)
 
         return {
             'related_models': self.get_related_models(request, groups),
         }
-    """
 
 
 @register_model_view(ContactGroup, 'add', detail=False)