diff --git a/comments/migrations/0014_auto_20170726_2117.py b/comments/migrations/0014_auto_20170726_2117.py
index aabeaf9f993d9f4e0935df4837070193f732bb29..60b9cc655291b4b665050b221526ecd5a23d7380 100644
--- a/comments/migrations/0014_auto_20170726_2117.py
+++ b/comments/migrations/0014_auto_20170726_2117.py
@@ -6,7 +6,7 @@ from django.db import migrations
from guardian.shortcuts import assign_perm
-from ..constants import STATUS_PENDING
+from ..models import Comment
def do_nothing(apps, schema_editor):
@@ -18,9 +18,9 @@ def update_eic_permissions(apps, schema_editor):
Grant EIC of submission related to unvetted comment
permission to vet his submission's comment.
"""
- Comment = apps.get_model('comments', 'Comment')
+ # Comment = apps.get_model('comments', 'Comment') -- This doesn't work...
count = 0
- for comment in Comment.objects.filter(status=STATUS_PENDING):
+ for comment in Comment.objects.filter(status=0):
if comment.submission:
eic_user = comment.submission.editor_in_charge.user
assign_perm('comments.can_vet_comments', eic_user, comment)
diff --git a/comments/templates/comments/_add_comment_form.html b/comments/templates/comments/_add_comment_form.html
index aa5a8bd0abe0f8b1d1b5c64899c88de47f3f9552..b3a51a16b34e172a2155dfb7ff6031e318a541e1 100644
--- a/comments/templates/comments/_add_comment_form.html
+++ b/comments/templates/comments/_add_comment_form.html
@@ -1,34 +1,62 @@
-<script>
- $(document).ready(function(){
+{% load bootstrap %}
- var comment_text_input = $("#id_comment_text");
+<script>
+ $(document).ready(function(){
+ var comment_text_input = $("#id_comment_text");
- function set_comment_text(value) {
- $("#preview-comment_text").text(value)
- }
- set_comment_text(comment_text_input.val())
+ comment_text_input.on('keyup', function(){
+ var new_text = $(this).val()
+ $("#preview-comment_text").text(new_text)
+ MathJax.Hub.Queue(["Typeset",MathJax.Hub]);
+ }).trigger('keyup')
+ });
+</script>
- comment_text_input.keyup(function(){
- var new_text = $(this).val()
- set_comment_text(new_text)
- MathJax.Hub.Queue(["Typeset",MathJax.Hub]);
- })
+<form enctype="multipart/form-data" action="{{url}}" method="post">
+ {% csrf_token %}
+ <div class="row">
+ <div class="col-md-9">
+ {{form.comment_text|bootstrap:'12,12'}}
+ <p>
+ In your comment, you can use LaTeX \$...\$ for in-text equations or \ [ ... \ ] for on-line equations.
+ </p>
+ <p id="goodCommenter"><em>
+ Be professional. Only serious and meaningful comments will be vetted through.
+ </em></p>
+ </div>
+ <div class="col-md-3 radio-list">
+ <label>Specify categorization(s):</label>
+ {{form.is_cor|bootstrap}}
+ {{form.is_rem|bootstrap}}
+ {{form.is_que|bootstrap}}
+ {{form.is_ans|bootstrap}}
+ {{form.is_obj|bootstrap}}
+ {{form.is_rep|bootstrap}}
+ {{form.is_val|bootstrap}}
+ {{form.is_lit|bootstrap}}
+ {{form.is_sug|bootstrap}}
+ </div>
+ </div>
- });
-</script>
+ <div class="row">
+ <div class="col-md-9">
+ {{form.remarks_for_editors|bootstrap:'12,12'}}
+ </div>
+ <div class="col-md-3">
+ {{form.file_attachment|bootstrap:'12,12'}}
+ </div>
+ </div>
-<div class="row">
- <div class="col-12">
- <form enctype="multipart/form-data" action="{{url}}" method="post">
- {% csrf_token %}
- {% load crispy_forms_tags %}
- {% crispy form %}
- </form>
- </div>
-</div>
+ <div class="row">
+ <div class="col-12">
+ <input type="submit" name="submit" value="Submit your Comment for vetting" class="btn btn-primary" id="submit-id-submit">
+ <p class="mt-2" id="goodCommenter"><i>By clicking on Submit, you agree with the <a target="_blank" href="{% url 'scipost:terms_and_conditions' %}">Terms and Conditions</a>.</i></p>
+ </div>
+ </div>
+</form>
<div class="row">
- <div class="col-md-10">
+ <div class="col-md-9">
<h3>Preview of your comment:</h3>
<p id="preview-comment_text"></p>
</div>
diff --git a/comments/templates/comments/_single_comment_with_link.html b/comments/templates/comments/_single_comment_with_link.html
index 06cf9a4b95f2bb72bfe3d90b5ed87eac4b8e0b73..9952e67b1dd0a805beb635e7a939784f101ddc5b 100644
--- a/comments/templates/comments/_single_comment_with_link.html
+++ b/comments/templates/comments/_single_comment_with_link.html
@@ -3,10 +3,6 @@
{% block comment_footer %}
{% if user.is_authenticated and perms.scipost.can_submit_comments %}
<hr class="small">
- <div class="row">
- <div class="col-12">
- <h3><a href="{% url 'comments:reply_to_comment' comment_id=comment.id %}">Reply to this comment</a></h3>
- </div>
- </div>
+ <h3><a href="{% url 'comments:reply_to_comment' comment_id=comment.id %}">Reply to this comment</a></h3>
{% endif %}
{% endblock %}
diff --git a/comments/templates/comments/new_comment.html b/comments/templates/comments/new_comment.html
index 4aedb638ec55c389f72c29ca872dd1cbb1aa6609..55d670be89d662dbad2d39a6f85bf65315bd7c63 100644
--- a/comments/templates/comments/new_comment.html
+++ b/comments/templates/comments/new_comment.html
@@ -2,83 +2,11 @@
{% if user.is_authenticated and open_for_commenting and perms.scipost.can_submit_comments %}
-<script>
- $(document).ready(function(){
-
- var comment_text_input = $("#id_comment_text");
-
- function set_comment_text(value) {
- $("#preview-comment_text").text(value)
- }
- set_comment_text(comment_text_input.val())
-
- comment_text_input.keyup(function(){
- var new_text = $(this).val()
- set_comment_text(new_text)
- MathJax.Hub.Queue(["Typeset",MathJax.Hub]);
- })
-
- });
-</script>
-
<hr>
-<div class="row" id="contribute_comment">
- <div class="col-12">
- <h2 class="highlight">Contribute a Comment:</h2>
- </div>
-</div>
-<div class="row">
- <div class="col-12">
- <form enctype="multipart/form-data"
- action="{% url 'comments:new_comment' object_id=object_id type_of_object=type_of_object %}"
- method="post">
- {% csrf_token %}
- <div class="row">
- <div class="col-md-9">
- {{form.comment_text|bootstrap:'12,12'}}
- <p>
- In your comment, you can use LaTeX \$...\$ for in-text equations or \ [ ... \ ] for on-line equations.
- </p>
- <p id="goodCommenter"><em>
- Be professional. Only serious and meaningful comments will be vetted through.
- </em></p>
- </div>
- <div class="col-md-3 radio-list">
- <label>Specify categorization(s):</label>
- {{form.is_cor|bootstrap}}
- {{form.is_rem|bootstrap}}
- {{form.is_que|bootstrap}}
- {{form.is_ans|bootstrap}}
- {{form.is_obj|bootstrap}}
- {{form.is_rep|bootstrap}}
- {{form.is_val|bootstrap}}
- {{form.is_lit|bootstrap}}
- {{form.is_sug|bootstrap}}
- </div>
- </div>
-
- <div class="row">
- <div class="col-md-9">
- {{form.remarks_for_editors|bootstrap:'12,12'}}
- </div>
- <div class="col-md-3">
- {{form.file_attachment|bootstrap:'12,12'}}
- </div>
- </div>
+<h2 class="highlight" id="contribute_comment">Contribute a Comment:</h2>
- <div class="row">
- <div class="col-12">
- <input type="submit" name="submit" value="Submit your Comment for vetting" class="btn btn-primary" id="submit-id-submit">
- <p class="mt-2" id="goodCommenter"><i>By clicking on Submit, you agree with the <a target="_blank" href="{% url 'scipost:terms_and_conditions' %}">Terms and Conditions</a>.</i></p>
- </div>
- </div>
- </form>
- </div>
- <div class="col-12">
- <h3>Preview of your comment:</h3>
- <p id="preview-comment_text"></p>
- </div>
-</div>
+{% url 'comments:new_comment' object_id=object_id type_of_object=type_of_object as url %}
+{% include 'comments/_add_comment_form.html' with form=form url=url %}
{% endif %}
diff --git a/comments/views.py b/comments/views.py
index 662841c025a96addd05519fea0a79eb128d99452..4ef6459aec3163f56e85878d84173240c77175bf 100644
--- a/comments/views.py
+++ b/comments/views.py
@@ -135,9 +135,9 @@ def reply_to_comment(request, comment_id):
is_author = False
if comment.submission and not is_author:
is_author = comment.submission.authors.filter(id=request.user.contributor.id).exists()
- elif comment.commentary and not is_author:
+ if comment.commentary and not is_author:
is_author = comment.commentary.authors.filter(id=request.user.contributor.id).exists()
- elif comment.thesislink and not is_author:
+ if comment.thesislink and not is_author:
is_author = comment.thesislink.author == request.user.contributor
form = CommentForm(request.POST or None, request.FILES or None)
@@ -156,6 +156,10 @@ def reply_to_comment(request, comment_id):
'It will soon be vetted by an Editor.')
if newcomment.submission:
+ # Add permissions for EIC only, the Vetting-group already has it!
+ assign_perm('comments.can_vet_comments', newcomment.submission.editor_in_charge.user,
+ newcomment)
+
return redirect(newcomment.submission.get_absolute_url())
elif newcomment.commentary:
return redirect(newcomment.commentary.get_absolute_url())
@@ -183,6 +187,10 @@ def reply_to_report(request, report_id):
newcomment.author = request.user.contributor
newcomment.save()
+ # Add permissions for EIC only, the Vetting-group already has it!
+ assign_perm('comments.can_vet_comments', newcomment.submission.editor_in_charge.user,
+ newcomment)
+
messages.success(request, '<h3>Thank you for contributing a Reply</h3>'
'It will soon be vetted by an Editor.')
return redirect(newcomment.submission.get_absolute_url())
diff --git a/scipost/management/commands/add_groups_and_permissions.py b/scipost/management/commands/add_groups_and_permissions.py
index ebc879cb2ac81bed4310f715e74da181274fab7f..9de95fd8b9fbd9a03677829ec90a66b3c329c83e 100644
--- a/scipost/management/commands/add_groups_and_permissions.py
+++ b/scipost/management/commands/add_groups_and_permissions.py
@@ -5,6 +5,7 @@ from django.contrib.contenttypes.models import ContentType
from partners.models import Contact
from scipost.models import Contributor, DraftInvitation
+from submissions.models import Report
class Command(BaseCommand):
@@ -36,6 +37,7 @@ class Command(BaseCommand):
content_type = ContentType.objects.get_for_model(Contributor)
content_type_contact = ContentType.objects.get_for_model(Contact)
content_type_draft_invitation = ContentType.objects.get_for_model(DraftInvitation)
+ content_type_report = ContentType.objects.get_for_model(Report)
# Supporting Partners
can_manage_SPB, created = Permission.objects.get_or_create(
@@ -130,7 +132,7 @@ class Command(BaseCommand):
name='Can request Thesis Links',
content_type=content_type)
- # Vetting of simple objects
+ # Vetting of objects
can_vet_commentary_requests, created = Permission.objects.get_or_create(
codename='can_vet_commentary_requests',
name='Can vet Commentary page requests',
@@ -147,6 +149,10 @@ class Command(BaseCommand):
codename='can_vet_comments',
name='Can vet submitted Comments',
content_type=content_type)
+ can_vet_submitted_reports, created = Permission.objects.get_or_create(
+ codename='can_vet_submitted_reports',
+ name='Can vet submitted Reports',
+ content_type=content_type_report)
# Submissions
can_submit_manuscript, created = Permission.objects.get_or_create(
@@ -171,10 +177,6 @@ class Command(BaseCommand):
codename='can_take_charge_of_submissions',
name='Can take charge (become Editor-in-charge) of submissions',
content_type=content_type)
- can_vet_submitted_reports, created = Permission.objects.get_or_create(
- codename='can_vet_submitted_reports',
- name='Can vet submitted Reports',
- content_type=content_type)
# Refereeing
can_referee, created = Permission.objects.get_or_create(
@@ -241,6 +243,7 @@ class Command(BaseCommand):
can_vet_commentary_requests,
can_vet_thesislink_requests,
can_vet_authorship_claims,
+ can_vet_submitted_reports,
can_vet_comments,
can_view_pool,
can_assign_submissions,
@@ -279,7 +282,6 @@ class Command(BaseCommand):
EditorialCollege.permissions.set([
can_view_pool,
can_take_charge_of_submissions,
- can_vet_submitted_reports,
view_bylaws,
can_attend_VGMs,
])
@@ -288,6 +290,7 @@ class Command(BaseCommand):
can_vet_commentary_requests,
can_vet_thesislink_requests,
can_vet_authorship_claims,
+ can_vet_submitted_reports,
can_vet_comments,
])
diff --git a/scipost/templates/scipost/personal_page.html b/scipost/templates/scipost/personal_page.html
index 399c1ea142f3ace9107ce46018b55e889a2b89dd..8a1af258f5819f432dc0fd6678e1f8ea552ba984 100644
--- a/scipost/templates/scipost/personal_page.html
+++ b/scipost/templates/scipost/personal_page.html
@@ -262,7 +262,7 @@
<li><a href="{% url 'scipost:vet_authorship_claims' %}">Vet Authorship Claims</a> ({{ nr_authorship_claims_to_vet }})</li>
{% endif %}
{% if perms.scipost.can_vet_submitted_reports %}
- <li><a href="{% url 'submissions:vet_submitted_reports' %}">Vet submitted Reports</a> ({{ nr_reports_to_vet }})</li>
+ <li><a href="{% url 'submissions:vet_submitted_reports_list' %}">Vet submitted Reports</a> ({{ nr_reports_to_vet }})</li>
{% endif %}
</ul>
{% endif %}
diff --git a/submissions/managers.py b/submissions/managers.py
index 43c1902c7c538f1cf93f7f462f22370831e9adbe..232c7ed9da7949148e0775276619a0378a089b64 100644
--- a/submissions/managers.py
+++ b/submissions/managers.py
@@ -151,7 +151,7 @@ class EICRecommendationManager(models.Manager):
return self.none()
-class ReportManager(models.Manager):
+class ReportQuerySet(models.QuerySet):
def accepted(self):
return self.filter(status=STATUS_VETTED)
diff --git a/submissions/migrations/0061_auto_20170727_1012.py b/submissions/migrations/0061_auto_20170727_1012.py
new file mode 100644
index 0000000000000000000000000000000000000000..af6a59d02f96680652df95d98b9354de9c0fd5fd
--- /dev/null
+++ b/submissions/migrations/0061_auto_20170727_1012.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-07-27 08:12
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+from guardian.shortcuts import assign_perm
+
+from ..models import Report
+
+
+def do_nothing(apps, schema_editor):
+ return
+
+
+def update_eic_permissions(apps, schema_editor):
+ """
+ Grant EIC of submission related to unvetted Reports
+ permission to vet his submission's Report.
+ """
+ # Report = apps.get_model('submissions', 'Report') -- This doesn't work due to shitty imports
+ count = 0
+ for rep in Report.objects.filter(status='unvetted'):
+ eic_user = rep.submission.editor_in_charge
+ assign_perm('submissions.can_vet_submitted_reports', eic_user.user, rep)
+ count += 1
+ print('\nGranted permission to %i Editor(s)-in-charge to vet related Reports.' % count)
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('submissions', '0060_merge_20170726_0945'),
+ ]
+
+ operations = [
+ migrations.RunPython(update_eic_permissions, do_nothing),
+ ]
diff --git a/submissions/migrations/0062_auto_20170727_1032.py b/submissions/migrations/0062_auto_20170727_1032.py
new file mode 100644
index 0000000000000000000000000000000000000000..c2f7ac53fdc2513e16c8322d11200e03bfd8a062
--- /dev/null
+++ b/submissions/migrations/0062_auto_20170727_1032.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-07-27 08:32
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('submissions', '0061_auto_20170727_1012'),
+ ]
+
+ operations = [
+ migrations.AlterModelOptions(
+ name='report',
+ options={'ordering': ['-date_submitted'], 'permissions': (('can_vet_submitted_reports', 'Can vet submitted Reports'),)},
+ ),
+ ]
diff --git a/submissions/models.py b/submissions/models.py
index 158ae9b3695dec0fa89b0306c1f1b085e79a4323..d189fa68f681e8b588a1bfd1b06b524ae6802a3c 100644
--- a/submissions/models.py
+++ b/submissions/models.py
@@ -13,7 +13,7 @@ from .constants import ASSIGNMENT_REFUSAL_REASONS, ASSIGNMENT_NULLBOOL,\
SUBMISSION_CYCLES, CYCLE_DEFAULT, CYCLE_SHORT, CYCLE_DIRECT_REC,\
EVENT_GENERAL, EVENT_TYPES, EVENT_FOR_AUTHOR, EVENT_FOR_EIC
from .managers import SubmissionManager, EditorialAssignmentManager, EICRecommendationManager,\
- ReportManager, SubmissionEventQuerySet
+ ReportQuerySet, SubmissionEventQuerySet
from .utils import ShortSubmissionCycle, DirectRecommendationSubmissionCycle,\
GeneralSubmissionCycle
@@ -343,12 +343,15 @@ class Report(models.Model):
anonymous = models.BooleanField(default=True, verbose_name='Publish anonymously')
pdf_report = models.FileField(upload_to='UPLOADS/REPORTS/%Y/%m/', max_length=200, blank=True)
- objects = ReportManager()
+ objects = ReportQuerySet.as_manager()
class Meta:
unique_together = ('submission', 'report_nr')
default_related_name = 'reports'
ordering = ['-date_submitted']
+ permissions = (
+ ('can_vet_submitted_reports', 'Can vet submitted Reports'),
+ )
def __str__(self):
return (self.author.user.first_name + ' ' + self.author.user.last_name + ' on ' +
diff --git a/submissions/templates/submissions/_single_public_report_without_comments.html b/submissions/templates/submissions/_single_public_report_without_comments.html
index 2c5c69adc82528e3cc09108b9c08eadff738020b..289f2169d1d34bc4bd64517f86e2dea2d29ff11e 100644
--- a/submissions/templates/submissions/_single_public_report_without_comments.html
+++ b/submissions/templates/submissions/_single_public_report_without_comments.html
@@ -7,14 +7,14 @@
{% if user.contributor == submission.editor_in_charge or user|is_in_group:'Editorial Administrators' and user|is_not_author_of_submission:submission.arxiv_identifier_w_vn_nr %}
<div class="reportid">
- <h3>{% if report.anonymous %}(chose public anonymity) {% endif %}<a href="{% url 'scipost:contributor_info' report.author.id %}">{{ report.author.user.first_name }} {{ report.author.user.last_name }}</a>
+ <h3>{% if report.anonymous %}(chose public anonymity) {% endif %}<a href="{{report.author.get_absolute_url}}">{{ report.author.user.first_name }} {{ report.author.user.last_name }}</a>
on {{ report.date_submitted|date:'Y-n-j' }}</h3>
</h3>
{% if report.pdf_report %}
<a href="{% url 'submissions:report_detail_pdf' report.submission.arxiv_identifier_w_vn_nr report.report_nr %}" target="_blank">Download as PDF</a>
{% endif %}
{% if perms.scipost.can_manage_reports %}
- {% if report.pdf_report %}· {% endif %}<a href="{% url 'submissions:report_pdf_compile' report.id %}"{% if not report.pdf_report %}class="btn btn-warning btn-sm"{% endif %}>Update/Compile the Report pdf</a>
+ {% if report.pdf_report %}· {% endif %}<a href="{% url 'submissions:report_pdf_compile' report.id %}">Update/Compile the Report pdf</a>
{% endif %}
</div>
@@ -46,14 +46,14 @@
</div>
{% else %}
<div class="reportid">
- <h3>{% if report.anonymous %}Anonymous Report {{report.report_nr}}{% else %}<a href="{% url 'scipost:contributor_info' report.author.id %}">{{ report.author.user.first_name }} {{ report.author.user.last_name }}</a>{% endif %}
+ <h3>{% if report.anonymous %}Anonymous Report {{report.report_nr}}{% else %}<a href="{{report.author.get_absolute_url}}">{{ report.author.user.first_name }} {{ report.author.user.last_name }}</a>{% endif %}
on {{ report.date_submitted|date:'Y-n-j' }}</h3>
</h3>
{% if report.pdf_report %}
<a href="{% url 'submissions:report_detail_pdf' report.submission.arxiv_identifier_w_vn_nr report.report_nr %}" target="_blank">Download as PDF</a>
{% endif %}
{% if perms.scipost.can_manage_reports %}
- {% if report.pdf_report %}· {% endif %}<a href="{% url 'submissions:report_pdf_compile' report.id %}"{% if not report.pdf_report %}class="btn btn-warning btn-sm"{% endif %}>Update/Compile the Report pdf</a>
+ {% if report.pdf_report %}· {% endif %}<a href="{% url 'submissions:report_pdf_compile' report.id %}">Update/Compile the Report pdf</a>
{% endif %}
</div>
diff --git a/submissions/templates/submissions/editorial_page.html b/submissions/templates/submissions/editorial_page.html
index aee2c35959ff5b4e807262693949cc2563e84567..3491f385ae65e41c9808a2a7e857825f67a18100 100644
--- a/submissions/templates/submissions/editorial_page.html
+++ b/submissions/templates/submissions/editorial_page.html
@@ -170,11 +170,24 @@
</div>
</form>
</li>
- <li><a href="{% url 'submissions:vet_submitted_reports' %}">Vet submitted Reports</a> ({{ submission.reports.awaiting_vetting.count }})</li>
+ {% with submission.reports.awaiting_vetting as reports %}
+ {% if reports %}
+ <li>
+ Vet submitted Report{{reports|pluralize}}:
+ <ul class="mb-1">
+ {% for report in reports %}
+ <li><a href="{% url 'submissions:vet_submitted_report' report.id %}">{{report}}</a></li>
+ {% endfor %}
+ </ul>
+ </li>
+ {% else %}
+ <li>All Reports have been vetted.</li>
+ {% endif %}
+ {% endwith %}
{% with submission.comments.awaiting_vetting as comments %}
{% if comments %}
<li>
- Vet submitted Comments:
+ Vet submitted Comment{{comments|pluralize}}:
<ul class="mb-1">
{% for comment in comments %}
<li><a href="{% url 'comments:vet_submitted_comment' comment.id %}">{{comment}}</a></li>
diff --git a/submissions/templates/submissions/vet_submitted_reports.html b/submissions/templates/submissions/vet_submitted_report.html
similarity index 92%
rename from submissions/templates/submissions/vet_submitted_reports.html
rename to submissions/templates/submissions/vet_submitted_report.html
index e37d0cc284bed3faf6bcb5130561ecb3dea0b4ac..64d36c03c9b7da45bd3285c4f4383d5bf3334f7f 100644
--- a/submissions/templates/submissions/vet_submitted_reports.html
+++ b/submissions/templates/submissions/vet_submitted_report.html
@@ -23,8 +23,7 @@ $(document).ready(function(){
{% block breadcrumb_items %}
{{block.super}}
- <a href="{% url 'submissions:pool' %}" class="breadcrumb-item">Pool</a>
- <span class="breadcrumb-item">Vet Reports</span>
+ <span class="breadcrumb-item">Vet Report {{report.report_nr}}</span>
{% endblock %}
{% block content %}
@@ -50,7 +49,7 @@ $(document).ready(function(){
<hr class="small">
<h2>Please vet this Report:</h2>
- <form action="{% url 'submissions:vet_submitted_reports' %}" method="post">
+ <form action="{% url 'submissions:vet_submitted_report' report_to_vet.id %}" method="post">
{% csrf_token %}
{{ form.report }}
{{ form.action_option|bootstrap }}
diff --git a/submissions/templates/submissions/vet_submitted_reports_list.html b/submissions/templates/submissions/vet_submitted_reports_list.html
new file mode 100644
index 0000000000000000000000000000000000000000..44697fdc21432a4a36b1278ec934c860a152b40f
--- /dev/null
+++ b/submissions/templates/submissions/vet_submitted_reports_list.html
@@ -0,0 +1,40 @@
+{% extends 'submissions/_pool_base.html' %}
+
+{% block pagetitle %}: vet reports{% endblock pagetitle %}
+
+{% block breadcrumb_items %}
+ {{block.super}}
+ <span class="breadcrumb-item">Vet Reports</span>
+{% endblock %}
+
+{% block content %}
+
+<h1>SciPost Reports to vet</h1>
+
+{% if reports_to_vet %}
+ <table class="table mt-4">
+ <thead>
+ <th>Report #</th>
+ <th>For submission</th>
+ <th>Submitted</th>
+ <th>Actions</th>
+ </thead>
+ <tbody>
+ {% for report in reports_to_vet %}
+ <tr>
+ <td>{{report.report_nr}}</td>
+ <td>{{report.submission.title}} ({{report.submission.arxiv_identifier_w_vn_nr}})</td>
+ <td>{{report.date_submitted|timesince}} ago</td>
+ <td><a href="{% url 'submissions:vet_submitted_report' report.id %}">Go to vetting page</a></td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+{% else %}
+ <h2 class="mt-3">There are no Reports for you to vet.</h2>
+ <p>Go back to my <a href="{% url 'scipost:personal_page' %}">personal page</a>.</p>
+{% endif %}
+
+<div class="mb-5"></div>
+
+{% endblock content %}
diff --git a/submissions/urls.py b/submissions/urls.py
index 008260237113d864a6c3a6cfce42c69b8557b6e6..8aaf200ee76128fc26c635f54bed0c6b6e93402e 100644
--- a/submissions/urls.py
+++ b/submissions/urls.py
@@ -91,7 +91,9 @@ urlpatterns = [
# Reports
url(r'^(?P<arxiv_identifier_w_vn_nr>[0-9]{4,}.[0-9]{5,}v[0-9]{1,2})/reports/submit$',
views.submit_report, name='submit_report'),
- url(r'^reports/vet_submitted$', views.vet_submitted_reports, name='vet_submitted_reports'),
+ url(r'^reports/vet$', views.vet_submitted_reports_list, name='vet_submitted_reports_list'),
+ url(r'^reports/(?P<report_id>[0-9]+)/vet$', views.vet_submitted_report,
+ name='vet_submitted_report'),
# Voting
url(r'^prepare_for_voting/(?P<rec_id>[0-9]+)$', views.prepare_for_voting, name='prepare_for_voting'),
diff --git a/submissions/views.py b/submissions/views.py
index b3578ac3a25e98ab8dfbce2aa0321ebb10171744..ff3cbadb075c9de3046e30f4b55e67def1b29285 100644
--- a/submissions/views.py
+++ b/submissions/views.py
@@ -15,7 +15,7 @@ from django.views.generic.edit import CreateView
from django.views.generic.list import ListView
from guardian.decorators import permission_required_or_403
-from guardian.shortcuts import assign_perm
+from guardian.shortcuts import assign_perm, get_objects_for_user
from .constants import SUBMISSION_STATUS_VOTING_DEPRECATED, STATUS_VETTED, STATUS_EIC_ASSIGNED,\
SUBMISSION_STATUS_PUBLICLY_INVISIBLE, SUBMISSION_STATUS, ED_COMM_CHOICES,\
@@ -1183,6 +1183,10 @@ def submit_report(request, arxiv_identifier_w_vn_nr):
SubmissionUtils.email_EIC_report_delivered()
SubmissionUtils.email_referee_report_delivered()
+ # Assign explicit permission to EIC to vet this report
+ assign_perm('submissions.can_vet_submitted_reports', submission.editor_in_charge.user,
+ newreport)
+
# Add SubmissionEvents for the EIC only, as it can also be rejected still
submission.add_event_for_eic('%s has submitted a new Report.'
% request.user.last_name)
@@ -1195,22 +1199,33 @@ def submit_report(request, arxiv_identifier_w_vn_nr):
@login_required
-@permission_required('scipost.can_take_charge_of_submissions', raise_exception=True)
-def vet_submitted_reports(request):
+@permission_required('submissions.can_vet_submitted_reports', raise_exception=True)
+def vet_submitted_reports_list(request):
+ """
+ Reports with status `unvetted` will be shown (oldest first).
"""
- Reports with status `unvetted` will be shown one-by-one (oldest first). A user may only
- vet reports of submissions he/she is EIC of.
+ reports_to_vet = Report.objects.awaiting_vetting().order_by('date_submitted')
+ context = {'reports_to_vet': reports_to_vet}
+ return render(request, 'submissions/vet_submitted_reports_list.html', context)
+
+
+@login_required
+@transaction.atomic
+def vet_submitted_report(request, report_id):
+ """
+ Report with status `unvetted` will be shown. A user may only vet reports of submissions
+ he/she is EIC of or if he/she is SciPost Admin or Vetting Editor.
After vetting an email is sent to the report author, bcc EIC. If report
has not been refused, the submission author is also mailed.
"""
- contributor = request.user.contributor
- report_to_vet = (Report.objects.awaiting_vetting()
- .select_related('submission')
- .filter(submission__editor_in_charge=contributor)
- .order_by('date_submitted').first())
+ # Method `get_objects_for_user` gets all Reports that are assigned to the user
+ # or *all* Reports if user is SciPost Admin or Vetting Editor.
+ report = get_object_or_404((get_objects_for_user(request.user,
+ 'submissions.can_vet_submitted_reports')
+ .awaiting_vetting()), id=report_id)
- form = VetReportForm(request.POST or None, initial={'report': report_to_vet})
+ form = VetReportForm(request.POST or None, initial={'report': report})
if form.is_valid():
report = form.process_vetting(request.user.contributor)
@@ -1230,15 +1245,17 @@ def vet_submitted_reports(request):
report.submission.add_event_for_author('A new Report has been submitted.')
message = 'Submitted Report vetted for <a href="%s">%s</a>.' % (
- reverse('submissions:editorial_page',
- args=(report.submission.arxiv_identifier_w_vn_nr,)),
- report.submission.arxiv_identifier_w_vn_nr
- )
+ report.submission.get_absolute_url(),
+ report.submission.arxiv_identifier_w_vn_nr)
messages.success(request, message)
- # Redirect instead of render to loose the POST call and make it a GET
- return redirect(reverse('submissions:vet_submitted_reports'))
- context = {'contributor': contributor, 'report_to_vet': report_to_vet, 'form': form}
- return render(request, 'submissions/vet_submitted_reports.html', context)
+
+ if report.submission.editor_in_charge == request.user.contributor:
+ # Redirect a EIC back to the Editorial Page!
+ return redirect(reverse('submissions:editorial_page',
+ args=(report.submission.arxiv_identifier_w_vn_nr,)))
+ return redirect(reverse('submissions:vet_submitted_reports_list'))
+ context = {'report_to_vet': report, 'form': form}
+ return render(request, 'submissions/vet_submitted_report.html', context)
@permission_required('scipost.can_prepare_recommendations_for_voting', raise_exception=True)