Merge pull request #7216 from akatsoulas/members-leaders

Add leaders as members through admin

Author: akatsoulas

kitsune/groups/admin.py

@@ -41,5 +41,12 @@ def get_form(self, request, obj=None, **kwargs):
 
         return form
 
+    def save_related(self, request, form, formsets, change):
+        """Ensure all leaders are also members of the group."""
+        super().save_related(request, form, formsets, change)
+        for leader in form.instance.leaders.all():
+            if not leader.groups.filter(pk=form.instance.group.pk).exists():
+                leader.groups.add(form.instance.group)
+
 
 admin.site.register(GroupProfile, GroupProfileAdmin)

kitsune/groups/tests/test_admin.py

@@ -0,0 +1,64 @@
+from django.contrib.admin.sites import AdminSite
+from django.contrib.auth.models import Group
+from django.test import RequestFactory
+
+from kitsune.groups.admin import GroupProfileAdmin
+from kitsune.groups.models import GroupProfile
+from kitsune.sumo.tests import TestCase
+from kitsune.users.tests import UserFactory
+
+
+class MockForm:
+    """Mock form for testing admin save_related."""
+
+    def __init__(self, instance):
+        self.instance = instance
+
+    def save_m2m(self):
+        """Mock save_m2m method required by Django admin."""
+        pass
+
+
+class GroupProfileAdminTests(TestCase):
+    """Tests for GroupProfile admin interface."""
+
+    def setUp(self):
+        self.factory = RequestFactory()
+        self.site = AdminSite()
+        self.admin = GroupProfileAdmin(GroupProfile, self.site)
+
+    def test_leader_added_as_member_via_admin(self):
+        """Ensure leaders added via admin are automatically added as members."""
+        group = Group.objects.create(name="Test Group")
+        profile = GroupProfile.add_root(group=group, slug="test-group")
+
+        user = UserFactory()
+        self.assertFalse(user.groups.filter(pk=group.pk).exists())
+
+        profile.leaders.add(user)
+
+        mock_request = self.factory.post("/admin/groups/groupprofile/")
+        mock_form = MockForm(profile)
+
+        self.admin.save_related(mock_request, mock_form, [], change=True)
+
+        self.assertTrue(user.groups.filter(pk=group.pk).exists())
+
+    def test_existing_member_stays_member(self):
+        """Ensure existing members who become leaders remain members."""
+        group = Group.objects.create(name="Test Group 2")
+        profile = GroupProfile.add_root(group=group, slug="test-group-2")
+
+        user = UserFactory()
+        user.groups.add(group)
+        self.assertTrue(user.groups.filter(pk=group.pk).exists())
+
+        profile.leaders.add(user)
+
+        mock_request = self.factory.post("/admin/groups/groupprofile/")
+        mock_form = MockForm(profile)
+
+        self.admin.save_related(mock_request, mock_form, [], change=True)
+
+        self.assertTrue(user.groups.filter(pk=group.pk).exists())
+        self.assertEqual(user.groups.filter(pk=group.pk).count(), 1)