From f8b5c8c4e80d6e6d204f1ae379796053aee4c3f4 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Sat, 30 Sep 2017 16:25:35 +0200
Subject: [PATCH] Fix merge conflict
---
scipost/views.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scipost/views.py b/scipost/views.py
index 58b871563..12d640fdd 100644
--- a/scipost/views.py
+++ b/scipost/views.py
@@ -732,7 +732,7 @@ def personal_page(request):
nr_reports_to_vet = 0
if contributor.is_MEC():
nr_assignments_to_consider = (contributor.editorial_assignments
- .in_consideration().count())
+ .open().count())
active_assignments = contributor.editorial_assignments.ongoing()
nr_reports_to_vet = (Report.objects.awaiting_vetting()
.filter(submission__editor_in_charge=contributor).count())
@@ -749,7 +749,7 @@ def personal_page(request):
nr_authorship_claims_to_vet = AuthorshipClaim.objects.awaiting_vetting().count()
# Refereeing
- nr_ref_inv_to_consider = contributor.referee_invitations.in_consideration().count()
+ nr_ref_inv_to_consider = contributor.referee_invitations.open().count()
pending_ref_tasks = contributor.referee_invitations.in_process()
refereeing_tab_total_count = nr_ref_inv_to_consider + len(pending_ref_tasks)
refereeing_tab_total_count += contributor.reports.in_draft().count()
--
GitLab