Skip to content

[ENG-8562] [OSF4I] Fix admin group query which filters by institution id using startswith #11293

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

Merged
merged 1 commit into from
Oct 29, 2025
Merged

[ENG-8562] [OSF4I] Fix admin group query which filters by institution id using startswith #11293

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
8 changes: 4 additions & 4 deletions admin/institutions/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ def get_queryset(self):
def get_context_data(self, **kwargs):
institution = Institution.objects.get(id=self.kwargs['institution_id'])
context = super().get_context_data(**kwargs)
admin_group = Group.objects.filter(name__startswith=f'institution_{institution._id}').first()
admin_group = Group.objects.filter(name=f'institution_{institution._id}_institutional_admins').first()
context['institution'] = institution
context['admins'] = admin_group.user_set.all()
return context
Expand All @@ -246,7 +246,7 @@ def post(self, request, *args, **kwargs):
messages.error(request, f'User for guid: {data["add-admins-form"][0]} could not be found')
return redirect('institutions:list_and_add_admin', institution_id=institution.id)

admin_group = Group.objects.filter(name__startswith=f'institution_{institution._id}').first()
admin_group = Group.objects.filter(name=f'institution_{institution._id}_institutional_admins').first()
admin_group.user_set.add(target_user)

messages.success(request, f'The following admin was successfully added: {target_user.fullname} ({target_user.username})')
Expand All @@ -263,7 +263,7 @@ def post(self, request, *args, **kwargs):
to_be_removed = list(data.keys())
removed_admins = [admin.replace('Admin-', '') for admin in to_be_removed if 'Admin-' in admin]
admins = OSFUser.objects.filter(id__in=removed_admins)
admin_group = Group.objects.filter(name__startswith=f'institution_{institution._id}').first()
admin_group = Group.objects.filter(name=f'institution_{institution._id}_institutional_admins').first()
admin_group.user_set.remove(*admins)

if admins:
Expand Down Expand Up @@ -362,7 +362,7 @@ def form_valid(self, form):
if not osf_user:
raise Http404(f'OSF user with id "{user_id}" not found. Please double check.')

group = Group.objects.filter(name__startswith=f'institution_{target_institution._id}').first()
group = Group.objects.filter(name=f'institution_{target_institution._id}_institutional_admins').first()

group.user_set.add(osf_user)
group.save()
Expand Down
Loading