From f8b65f550ff219b37e8b3b4f15bf0d18f01c9668 Mon Sep 17 00:00:00 2001 From: Jorran de Wit <jorrandewit@outlook.com> Date: Tue, 25 Jul 2017 20:46:24 +0200 Subject: [PATCH] Add submission.accepted filter --- journals/views.py | 6 +++--- submissions/managers.py | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/journals/views.py b/journals/views.py index 321c2adeb..d0280d72d 100644 --- a/journals/views.py +++ b/journals/views.py @@ -89,9 +89,9 @@ def accepted(request, doi_label): have been accepted but are not yet published. """ journal = get_object_or_404(Journal, doi_label=doi_label) - accepted_SP_submissions = Submission.objects.filter( - submitted_to_journal=journal.name, status='accepted' - ).order_by('-latest_activity') + accepted_SP_submissions = (Submission.objects.accepted() + .filter(submitted_to_journal=journal.name) + .order_by('-latest_activity')) context = { 'accepted_SP_submissions': accepted_SP_submissions, 'journal': journal diff --git a/submissions/managers.py b/submissions/managers.py index 3c094fae6..cba54e4f6 100644 --- a/submissions/managers.py +++ b/submissions/managers.py @@ -96,6 +96,9 @@ class SubmissionManager(models.Manager): return self.filter(status__in=[STATUS_ACCEPTED, STATUS_REJECTED_VISIBLE, STATUS_PUBLISHED, STATUS_RESUBMITTED, STATUS_RESUBMITTED_REJECTED_VISIBLE]) + def accepted(self): + return self.filter(status=STATUS_ACCEPTED) + class SubmissionEventQuerySet(models.QuerySet): def for_author(self): -- GitLab