From 43ff4f93336ac7776ff25f70d9a2f1c38ef64c2a Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Tue, 6 Feb 2018 09:51:43 +0100
Subject: [PATCH] Refine and debug email
---
.../management/commands/email_fellows_tasklist.py | 2 +-
submissions/managers.py | 2 +-
templates/email/email_fellow_tasklist.html | 10 +++++-----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/submissions/management/commands/email_fellows_tasklist.py b/submissions/management/commands/email_fellows_tasklist.py
index eec5ee2c8..7c79b557c 100644
--- a/submissions/management/commands/email_fellows_tasklist.py
+++ b/submissions/management/commands/email_fellows_tasklist.py
@@ -10,7 +10,7 @@ class Command(BaseCommand):
help = 'Sends an email to Fellows with current and upcoming tasks list'
def handle(self, *args, **kwargs):
fellows = Contributor.objects.fellows(
- ).filter(user__last_name__startswith='B' # temporary limitation, to ease testing
+ ).filter(user__last_name__istartswith='C' # temporary limitation, to ease testing
).order_by('user__last_name')
for fellow in fellows:
diff --git a/submissions/managers.py b/submissions/managers.py
index 8379bc753..c31adb4fc 100644
--- a/submissions/managers.py
+++ b/submissions/managers.py
@@ -251,7 +251,7 @@ class EditorialAssignmentQuerySet(models.QuerySet):
return self.filter(completed=True)
def ongoing(self):
- return self.filter(completed=False).accepted()
+ return self.filter(completed=False, deprecated=False).accepted()
def open(self):
return self.filter(accepted=None, deprecated=False)
diff --git a/templates/email/email_fellow_tasklist.html b/templates/email/email_fellow_tasklist.html
index 197296867..7af83e7ac 100644
--- a/templates/email/email_fellow_tasklist.html
+++ b/templates/email/email_fellow_tasklist.html
@@ -7,7 +7,7 @@
<ul>
{% for assignment in assignments_to_consider %}
<li>On submission: {{ assignment.submission }}<br>
- <a href="{% url 'submissions:assignment_request' assignment.id %}">Accept or decline here</a>
+ <a href="https://scipost.org{% url 'submissions:assignment_request' assignment.id %}">Accept or decline here</a>
</li>
{% endfor %}
</ul>
@@ -19,10 +19,10 @@
<li>
<div class="pool-item">
<p class="mb-1">
- <a href="{% url 'submissions:pool' assignment.submission.arxiv_identifier_w_vn_nr %}">{{ assignment.submission.title }}</a><br>
+ <a href="https://scipost.org{% url 'submissions:pool' assignment.submission.arxiv_identifier_w_vn_nr %}">{{ assignment.submission.title }}</a><br>
<em>by {{ assignment.submission.author_list }}</em>
</p>
- <p><a href="{% url 'submissions:editorial_page' assignment.submission.arxiv_identifier_w_vn_nr %}">Go to this Submission's Editorial page</a></p>
+ <p><a href="https://scipost.org{% url 'submissions:editorial_page' assignment.submission.arxiv_identifier_w_vn_nr %}">Go to this Submission's Editorial page</a></p>
{% include 'submissions/_required_actions_block.html' with submission=assignment.submission %}
</div>
</li>
@@ -36,11 +36,11 @@
<li>
<div class="pool-item">
<p class="mb-1">
- <a href="{% url 'submissions:pool' assignment.submission.arxiv_identifier_w_vn_nr %}">{{ assignment.submission.title }}</a><br>
+ <a href="https://scipost.org{% url 'submissions:pool' assignment.submission.arxiv_identifier_w_vn_nr %}">{{ assignment.submission.title }}</a><br>
<em>by {{ assignment.submission.author_list }}</em>
</p>
<p>Refereeing deadline: {{ assignment.submission.reporting_deadline|date:"Y-m-d" }}.</p>
- <p><a href="{% url 'submissions:editorial_page' assignment.submission.arxiv_identifier_w_vn_nr %}">Go to this Submission's Editorial page</a></p>
+ <p><a href="https://scipost.org{% url 'submissions:editorial_page' assignment.submission.arxiv_identifier_w_vn_nr %}">Go to this Submission's Editorial page</a></p>
</div>
</li>
{% endfor %}
--
GitLab