From 19641cd32655d08c113ed1c03c1e20f9bd7451d8 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Tue, 6 Feb 2018 06:20:56 +0100
Subject: [PATCH] Improve email Fellow tasklist

---
 submissions/management/commands/email_fellows_tasklist.py | 4 ++--
 templates/email/email_fellow_tasklist.html                | 5 ++++-
 templates/email/email_fellow_tasklist.txt                 | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/submissions/management/commands/email_fellows_tasklist.py b/submissions/management/commands/email_fellows_tasklist.py
index 90d19e235..efeb5eb7b 100644
--- a/submissions/management/commands/email_fellows_tasklist.py
+++ b/submissions/management/commands/email_fellows_tasklist.py
@@ -14,8 +14,8 @@ class Command(BaseCommand):
         ).order_by('user__last_name')
 
         for fellow in fellows:
-            submissions_as_eic = Submission.objects.filter(
-                editor_in_charge=fellow).order_by('submission_date')
+            submissions_as_eic = Submission.objects.filter_for_eic(
+                fellow.user).order_by('submission_date')
             assignments_to_consider = EditorialAssignment.objects.open().filter(
                 to=fellow)
             if submissions_as_eic or assignments_to_consider:
diff --git a/templates/email/email_fellow_tasklist.html b/templates/email/email_fellow_tasklist.html
index 18721cefa..4f555a08a 100644
--- a/templates/email/email_fellow_tasklist.html
+++ b/templates/email/email_fellow_tasklist.html
@@ -29,7 +29,10 @@
 </ul>
 {% endif %}
 <p>
-    Many thanks for your work,<br>
+  Don't hesitate to <a href="mailto:edadmin@scipost.org">email the editorial administration</a> if you need any assistance.
+</p>
+<p>
+    Many thanks,<br>
     The SciPost Team.
 </p>
 {% include 'email/_footer.html' %}
diff --git a/templates/email/email_fellow_tasklist.txt b/templates/email/email_fellow_tasklist.txt
index eaa14516c..3cc75670c 100644
--- a/templates/email/email_fellow_tasklist.txt
+++ b/templates/email/email_fellow_tasklist.txt
@@ -24,6 +24,6 @@ No actions required\n
 {% endfor %}
 {% endif %}
 \n
-You can take action on all of these starting from your personal page at https://scipost.org/personal_page.\n\n
-Many thanks for your work,\n
+You can take action on all of these starting from your personal page at https://scipost.org/personal_page. Don't hesitate to email the editorial administration at edadmin@scipost.org if you need any assistance.\n\n
+Many thanks,\n
 The SciPost Team.
-- 
GitLab