From dfdb1a987a59180b2fa6b8c844c19e3bba976ad4 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Wed, 22 Nov 2017 12:18:35 +0100
Subject: [PATCH] Activate new Pool for all Fellows
---
submissions/templates/submissions/pool.html | 8 +++++
submissions/views.py | 37 ++-------------------
2 files changed, 11 insertions(+), 34 deletions(-)
diff --git a/submissions/templates/submissions/pool.html b/submissions/templates/submissions/pool.html
index d52f9fa2c..97489bda2 100644
--- a/submissions/templates/submissions/pool.html
+++ b/submissions/templates/submissions/pool.html
@@ -2,6 +2,14 @@
{% block pagetitle %}: Submissions Pool{% endblock pagetitle %}
+{% comment %}
+
+ This template is U/S; to be removed.
+
+ -- JdW 22 Nov, 2017
+
+{% endcomment %}
+
{% load bootstrap %}
{% load guardian_tags %}
{% load scipost_extras %}
diff --git a/submissions/views.py b/submissions/views.py
index 071c5d599..64a46d737 100644
--- a/submissions/views.py
+++ b/submissions/views.py
@@ -39,7 +39,6 @@ from scipost.forms import ModifyPersonalMessageForm, RemarkForm
from scipost.mixins import PaginationMixin
from scipost.models import Contributor, Remark, RegistrationInvitation
from scipost.utils import Utils
-from scipost.permissions import is_tester
from comments.forms import CommentForm
from production.forms import ProofsDecisionForm
@@ -340,10 +339,6 @@ def pool(request, arxiv_identifier_w_vn_nr=None):
to publication acceptance or rejection.
All members of the Editorial College have access.
"""
- # Objects
-
- # The following is in test phase. Update if test is done
- # --
# Search
search_form = SubmissionPoolFilterForm(request.GET or None)
if search_form.is_valid():
@@ -355,7 +350,8 @@ def pool(request, arxiv_identifier_w_vn_nr=None):
# submissions = Submission.objects.pool(request.user)
recommendations = EICRecommendation.objects.filter(submission__in=submissions)
recs_to_vote_on = recommendations.user_may_vote_on(request.user)
- assignments_to_consider = EditorialAssignment.objects.open().filter(to=request.user.contributor)
+ assignments_to_consider = EditorialAssignment.objects.open().filter(
+ to=request.user.contributor)
# Forms
consider_assignment_form = ConsiderAssignmentForm()
@@ -374,9 +370,6 @@ def pool(request, arxiv_identifier_w_vn_nr=None):
'remark_form': remark_form,
}
- # The following is in test phase. Update if test is done
- # --
-
# Show specific submission in the pool
context['submission'] = None
if arxiv_identifier_w_vn_nr:
@@ -393,36 +386,12 @@ def pool(request, arxiv_identifier_w_vn_nr=None):
# Temporary test logic: only testers see the new Pool
if context['submission'] and request.is_ajax():
template = 'partials/submissions/pool/submission_details.html'
- elif is_tester(request.user) and not request.GET.get('test') or True:
- template = 'submissions/pool/pool.html'
else:
- template = 'submissions/pool.html'
+ template = 'submissions/pool/pool.html'
return render(request, template, context)
@login_required
-@permission_required('scipost.can_view_pool', raise_exception=True)
-def submissions_by_status(request, status):
- # ---
- # DEPRECATED AS PER NEW POOL
- # ---
- status_dict = dict(SUBMISSION_STATUS)
- if status not in status_dict.keys():
- errormessage = 'Unknown status.'
- return render(request, 'scipost/error.html', {'errormessage': errormessage})
- submissions_of_status = (Submission.objects.pool_full(request.user)
- .filter(status=status).order_by('-submission_date'))
-
- context = {
- 'submissions_of_status': submissions_of_status,
- 'status': status_dict[status],
- 'remark_form': RemarkForm()
- }
- return render(request, 'submissions/submissions_by_status.html', context)
-
-
-@login_required
-# @permission_required('scipost.can_view_pool', raise_exception=True)
def add_remark(request, arxiv_identifier_w_vn_nr):
"""
With this method, an Editorial Fellow or Board Member
--
GitLab