From 5f04dbe027214911dfe23c37d05e4b32de0a8214 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Sat, 8 Jul 2017 09:51:28 +0200
Subject: [PATCH] Fix merge conflict
---
scipost/managers.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scipost/managers.py b/scipost/managers.py
index 632d0cf8d..1a4a401fd 100644
--- a/scipost/managers.py
+++ b/scipost/managers.py
@@ -22,6 +22,9 @@ class ContributorManager(models.Manager):
def active(self):
return self.filter(user__is_active=True, status=CONTRIBUTOR_NORMAL)
+ def awaiting_validation(self):
+ return self.filter(user__is_active=False, status=CONTRIBUTOR_NEWLY_REGISTERED)
+
class RegistrationInvitationManager(models.Manager):
def pending_invited_fellows(self):
@@ -31,6 +34,3 @@ class RegistrationInvitationManager(models.Manager):
def declined_invited_fellows(self):
return self.filter(invitation_type=INVITATION_EDITORIAL_FELLOW,
responded=False, declined=True)
-
- def awaiting_validation(self):
- return self.filter(user__is_active=False, status=CONTRIBUTOR_NEWLY_REGISTERED)
--
GitLab