Merge pull request #7225 from akatsoulas/fix-member-removal

Do not automatically remove leader from group

Author: akatsoulas

kitsune/groups/tests/test_views.py

@@ -160,6 +160,7 @@ def test_add_leader(self):
 
     def test_remove_leader(self):
         self.group_profile.leaders.add(self.leader)
+        self.leader.groups.add(self.group_profile.group)
         url = reverse(
             "groups.remove_leader", locale="en-US", args=[self.group_profile.slug, self.leader.id]
         )
@@ -168,6 +169,7 @@ def test_remove_leader(self):
         r = self.client.post(url)
         self.assertEqual(302, r.status_code)
         assert self.leader not in self.group_profile.leaders.all()
+        assert self.leader in self.group_profile.group.user_set.all()
 
     def test_cannot_remove_last_leader_from_root(self):
         """Cannot remove the last leader from a root group."""

kitsune/groups/views.py

@@ -16,13 +16,20 @@
 from kitsune.upload.tasks import create_image_thumbnail
 
 
-def _remove_group_member(profile, user, request):
+def _remove_group_member(profile, user, request, remove_from_group=True):
     """
     Remove a member/leader from a group with validation.
 
     Handles both regular members and leaders, with appropriate validation
     and error messages for the last leader scenario.
 
+    Args:
+        profile: The GroupProfile to remove the user from
+        user: The user to remove
+        request: The HTTP request object
+        remove_from_group: If True, removes user from group entirely.
+                          If False, only removes from leaders (demotes to regular member).
+
     Returns True if removed successfully, False if validation failed.
     """
     is_leader = profile.leaders.filter(pk=user.pk).exists()
@@ -38,7 +45,10 @@ def _remove_group_member(profile, user, request):
 
     if is_leader:
         profile.leaders.remove(user)
-    user.groups.remove(profile.group)
+
+    if remove_from_group:
+        user.groups.remove(profile.group)
+
     return True
 
 
@@ -235,7 +245,7 @@ def remove_leader(request, group_slug, user_id):
         raise PermissionDenied
 
     if request.method == "POST":
-        if _remove_group_member(prof, user, request):
+        if _remove_group_member(prof, user, request, remove_from_group=False):
             msg = _("{user} removed from the group leaders successfully!").format(
                 user=user.username
             )