From 8ca0fc2010c6549430f82b6b7853acb04a1fdd07 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Thu, 4 Jan 2018 17:04:35 +0100
Subject: [PATCH] Improve checks for admins
---
scipost/models.py | 3 ++-
scipost/views.py | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/scipost/models.py b/scipost/models.py
index dee115e5c..265d2d9b6 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 ec399dd68..b91538002 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}
--
GitLab