fix: add user to Org Admin group when editing org admin

judge/forms.py

@@ -457,6 +457,13 @@ class Meta:
                 ),
             })
 
+    def __init__(self, *args, **kwargs):
+        request = kwargs.pop('request', None)  # Pop 'request' from kwargs
+        super().__init__(*args, **kwargs)
+
+        if request and not request.user.is_superuser:
+            self.fields.pop('admins')
+
 
 class SocialAuthMixin:
     def _has_social_auth(self, key):

judge/utils/organization.py

@@ -0,0 +1,10 @@
+from django.conf import settings
+from django.contrib.auth.models import Group
+
+
+def add_admin_to_group(form):
+    org = form.save()
+    all_admins = org.admins.all()
+    g = Group.objects.get(name=settings.GROUP_PERMISSION_FOR_ORG_ADMIN)
+    for admin in all_admins:
+        admin.user.groups.add(g)

judge/views/organization.py

@@ -4,7 +4,6 @@
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.mixins import LoginRequiredMixin, PermissionRequiredMixin
-from django.contrib.auth.models import Group
 from django.core.exceptions import ImproperlyConfigured, PermissionDenied
 from django.db.models import Count, FilteredRelation, Q
 from django.db.models.expressions import F, Value
@@ -25,6 +24,7 @@
     Problem, Profile
 from judge.tasks import on_new_problem
 from judge.utils.infinite_paginator import InfinitePaginationMixin
+from judge.utils.organization import add_admin_to_group
 from judge.utils.ranker import ranker
 from judge.utils.views import DiggPaginatorMixin, QueryStringSortMixin, TitleMixin, generic_message
 from judge.views.blog import BlogPostCreate, PostListBase
@@ -380,10 +380,7 @@ def form_valid(self, form):
             # short_name is show in ranking
             org.short_name = org.slug[:20]
             org.save()
-            all_admins = org.admins.all()
-            g = Group.objects.get(name=settings.GROUP_PERMISSION_FOR_ORG_ADMIN)
-            for admin in all_admins:
-                admin.user.groups.add(g)
+            add_admin_to_group(form)
 
             return HttpResponseRedirect(self.get_success_url())
 
@@ -420,8 +417,14 @@ def form_valid(self, form):
         with revisions.create_revision(atomic=True):
             revisions.set_comment(_('Edited from site'))
             revisions.set_user(self.request.user)
+            add_admin_to_group(form)
             return super(EditOrganization, self).form_valid(form)
 
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs['request'] = self.request  # Pass the request object to the form
+        return kwargs
+
 
 class KickUserWidgetView(LoginRequiredMixin, AdminOrganizationMixin, SingleObjectMixin, View):
     def post(self, request, *args, **kwargs):