diff --git a/scipost/models.py b/scipost/models.py index dee115e5c6621332c14afb43f6b6534014829258..265d2d9b63ab269a8de20aebb859a63343c5ba8d 100644 --- a/scipost/models.py +++ b/scipost/models.py @@ -86,7 +86,8 @@ class Contributor(models.Model): return self.user.groups.filter(name='Editorial Administrators').exists() def is_SP_Admin(self): - return self.user.groups.filter(name='SciPost Administrators').exists() + return (self.user.groups.filter(name='SciPost Administrators').exists() + or self.user.is_superuser) def is_MEC(self): return self.user.groups.filter(name='Editorial College').exists() diff --git a/scipost/views.py b/scipost/views.py index ec399dd681d8dc9561d70a07029347d86e68e35b..b915380025f27fe03f00ef51651f1920ba48b8c6 100644 --- a/scipost/views.py +++ b/scipost/views.py @@ -245,7 +245,7 @@ def unsubscribe(request, contributor_id, key): @permission_required('scipost.can_vet_registration_requests', return_403=True) def vet_registration_requests(request): contributors_to_vet = (Contributor.objects - .filter(user__is_active=True, status=0) + .awaiting_vetting() .order_by('key_expires')) form = VetRegistrationForm() context = {'contributors_to_vet': contributors_to_vet, 'form': form}