Skip to content

[ENG-8522] Preprints: Adding new moderator alters role for other users #11250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: feature/pbs-25-21
Choose a base branch
from
Open

[ENG-8522] Preprints: Adding new moderator alters role for other users #11250

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions api/providers/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import hashlib
from django.db.models import Case, CharField, Q, Value, When, IntegerField
from django.db.models import Case, CharField, Q, Value, When, IntegerField, OuterRef, Exists
from django.http import JsonResponse
from rest_framework.exceptions import ValidationError
from rest_framework import generics
Expand Down Expand Up @@ -638,9 +638,12 @@ def get_default_queryset(self):
provider = self.get_provider()
admin_group = provider.get_group(ADMIN)
mod_group = provider.get_group('moderator')
return (admin_group.user_set.all() | mod_group.user_set.all()).annotate(

admin_membership_subquery = admin_group.user_set.filter(id=OuterRef('id'))
return OSFUser.objects.filter(Q(groups=admin_group) | Q(groups=mod_group)).distinct().annotate(
is_admin=Exists(admin_membership_subquery),
permission_group=Case(
When(groups=admin_group, then=Value(ADMIN)),
When(is_admin=True, then=Value(ADMIN)),
default=Value('moderator'),
output_field=CharField(),
),
Expand Down
Loading