Skip to content

Commit efdc005

Browse files
committed
fixed institution group lookup in admin
1 parent 104db68 commit efdc005

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

admin/institutions/views.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ def get_queryset(self):
223223
def get_context_data(self, **kwargs):
224224
institution = Institution.objects.get(id=self.kwargs['institution_id'])
225225
context = super().get_context_data(**kwargs)
226-
admin_group = Group.objects.filter(name__startswith=f'institution_{institution._id}').first()
226+
admin_group = Group.objects.filter(name=f'institution_{institution._id}_institutional_admins').first()
227227
context['institution'] = institution
228228
context['admins'] = admin_group.user_set.all()
229229
return context
@@ -246,7 +246,7 @@ def post(self, request, *args, **kwargs):
246246
messages.error(request, f'User for guid: {data["add-admins-form"][0]} could not be found')
247247
return redirect('institutions:list_and_add_admin', institution_id=institution.id)
248248

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

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

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

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

367367
group.user_set.add(osf_user)
368368
group.save()

0 commit comments

Comments
 (0)