diff --git a/comments/templates/partials/comments/comments_list.html b/comments/templates/partials/comments/comments_list.html
index 169158b74a83ba6cc6039057fbc73bc444fcaa6f..ea3e9ac08e398d5ad273a886e34f42cd4e4f6f0d 100644
--- a/comments/templates/partials/comments/comments_list.html
+++ b/comments/templates/partials/comments/comments_list.html
@@ -1,7 +1,7 @@
{% if comments %}
<ul class="{{ css_class|default:'' }}">
{% for comment in comments %}
- <li><a href="{{ comment.get_absolute_url }}">{% if comment.is_author_reply %}Author Reply{% else %}Comment{% endif %} by {{ comment.author.get_title_display }} {{ comment.author.user.last_name }} on {{ comment.date_submitted|date:'DATE_FORMAT' }}</a></li>
+ <li><a href="{{ comment.get_absolute_url }}"{% if target_blank %} target="_blank"{% endif %}>{% if comment.is_author_reply %}Author Reply{% else %}Comment{% endif %} by {{ comment.author.get_title_display }} {{ comment.author.user.last_name }} on {{ comment.date_submitted|date:'DATE_FORMAT' }}</a></li>
{% include 'partials/comments/comments_list.html' with comments=comment.nested_comments.vetted css_class='m-0 pl-4' %}
{% endfor %}
</ul>
diff --git a/scipost/templates/scipost/contributors_filter.html b/scipost/templates/scipost/contributors_filter.html
index 2c32cc28cf1a35a49fdd14c5388d0a8ce69d736a..eedc758ad56422aea9a9aeee8717b017e1f594f9 100644
--- a/scipost/templates/scipost/contributors_filter.html
+++ b/scipost/templates/scipost/contributors_filter.html
@@ -15,8 +15,10 @@
<div class="row">
<div class="col-12">
<h1 class="highlight">Contributors filter</h1>
+
<p>This form can be used to split your list of names into a list of names with registered or already invited Contributors and a list of unknown names according to the current database.</p>
<p>Please, for every name use the format <code>{last name}</code> or <code>{last name}, {first name}</code> and use one name per line.</p>
+
<form method="post">
{% csrf_token %}
{{ form|bootstrap }}
@@ -26,6 +28,7 @@
</div>
{% if form.is_bound %}
+
<hr class="divider">
<h2>Filter result</h2>
{% if names_not_found %}
@@ -36,6 +39,7 @@
{% if names_found %}
<h3>Names found in the system</h3>
<pre><code>{% for name in names_found %}{{ name }}{% if not forloop.last %}<br>{% endif %}{% endfor %}</code></pre>
+
{% endif %}
{% endif %}
diff --git a/submissions/constants.py b/submissions/constants.py
index 5d9c0a2b25974dfe02f6f05c7e5e0cca899004f4..c06c7aa50671192b367b90113867d785e6ee5e40 100644
--- a/submissions/constants.py
+++ b/submissions/constants.py
@@ -253,6 +253,6 @@ SUBMISSIONS_COMPLETE_REGEX = '(?P<arxiv_identifier_w_vn_nr>[0-9]{4,}.[0-9]{4,}v[
#
# CAUTION: *triple* check whether the `default` regex also meets any other explicit journal regex!
EXPLICIT_REGEX_MANUSCRIPT_CONSTRAINTS = {
- SCIPOST_JOURNAL_PHYSICS: '(?P<arxiv_identifier_w_vn_nr>[0-9]{4,}.[0-9]{5,}v[0-9]{1,2})',
+ SCIPOST_JOURNAL_PHYSICS: '(?P<arxiv_identifier_w_vn_nr>[0-9]{4,}.[0-9]{4,}v[0-9]{1,2})',
'default': SUBMISSIONS_COMPLETE_REGEX
}
diff --git a/submissions/forms.py b/submissions/forms.py
index a25a3b5022e656561dc64c6354b6f670f32546b3..3784031645d090097fa265db42b42111e08258cb 100644
--- a/submissions/forms.py
+++ b/submissions/forms.py
@@ -779,6 +779,7 @@ class EICRecommendationForm(forms.ModelForm):
# The EIC has fulfilled this editorial assignment.
self.assignment.completed = True
self.assignment.save()
+ return recommendation
def revision_requested(self):
return self.instance.recommendation in [-1, -2]
diff --git a/submissions/templates/partials/submissions/pool/submission_details.html b/submissions/templates/partials/submissions/pool/submission_details.html
index 7673c8703ef52d88590e9465e2278d26221de999..766d9c28591f67b1a6b8aa8b0a9e760197b49da2 100644
--- a/submissions/templates/partials/submissions/pool/submission_details.html
+++ b/submissions/templates/partials/submissions/pool/submission_details.html
@@ -13,7 +13,14 @@
</div>
<div class="card-body px-0">
- {% include 'partials/submissions/pool/submission_info_table.html' with submission=submission %}
+ <div class="row">
+ <div class="col-md-8">
+ {% include 'partials/submissions/pool/submission_info_table.html' with submission=submission %}
+ </div>
+ <div class="col-md-4">
+ {% include 'partials/submissions/submission_refereeing_history.html' with submission=submission target_blank=1 %}
+ </div>
+ </div>
</div>
<div>
diff --git a/submissions/templates/partials/submissions/submission_refereeing_history.html b/submissions/templates/partials/submissions/submission_refereeing_history.html
index f18c535463acc976ac0e9efe5227c6f24809351c..d06060785ea20def89f97497bb88d4a7887dc469 100644
--- a/submissions/templates/partials/submissions/submission_refereeing_history.html
+++ b/submissions/templates/partials/submissions/submission_refereeing_history.html
@@ -5,16 +5,16 @@
<h3 class="card-title">Submission & Refereeing History</h3>
{% for sibling in submission.thread %}
<div class="my-2">
- {% if forloop.last %}Submission{% else %}Resubmission{% endif %} <a href="{{ sibling.get_absolute_url }}" class="pubtitleli">{{ sibling.arxiv_identifier_w_vn_nr }}</a> ({{ sibling.submission_date|date:'j F Y' }})
+ {% if forloop.last %}Submission{% else %}Resubmission{% endif %} <a href="{{ sibling.get_absolute_url }}" class="pubtitleli"{% if target_blank %} target="_blank"{% endif %}>{{ sibling.arxiv_identifier_w_vn_nr }}</a> ({{ sibling.submission_date|date:'j F Y' }})
</div>
<ul class="m-0 pl-4">
{% for report in sibling.reports.accepted %}
- <li><a href="{{ report.get_absolute_url }}">Report {{ report.report_nr }} submitted on {{ report.date_submitted }} by {% if report.anonymous %}<em>Anonymous</em>{% else %}{{ report.author.get_title_display }} {{ report.author.user.last_name }}{% endif %}</a></li>
- {% include 'partials/comments/comments_list.html' with comments=report.comments.vetted css_class='my-1 pl-4' %}
+ <li><a href="{{ report.get_absolute_url }}"{% if target_blank %} target="_blank"{% endif %}>Report {{ report.report_nr }} submitted on {{ report.date_submitted }} by {% if report.anonymous %}<em>Anonymous</em>{% else %}{{ report.author.get_title_display }} {{ report.author.user.last_name }}{% endif %}</a></li>
+ {% include 'partials/comments/comments_list.html' with comments=report.comments.vetted css_class='my-1 pl-4' target_blank=target_blank %}
{% endfor %}
</ul>
- {% include 'partials/comments/comments_list.html' with comments=sibling.comments.vetted css_class='my-1 pl-4' %}
+ {% include 'partials/comments/comments_list.html' with comments=sibling.comments.vetted css_class='my-1 pl-4' target_blank=target_blank %}
{% endfor %}
</div>
</div>
diff --git a/submissions/templates/submissions/editorial_page.html b/submissions/templates/submissions/editorial_page.html
index bb0048c3e0cdd2752a92d6fa7162209dd270641b..2711220d5e2bcb6800d0401fb1d3b272e5a152bd 100644
--- a/submissions/templates/submissions/editorial_page.html
+++ b/submissions/templates/submissions/editorial_page.html
@@ -15,36 +15,16 @@
{% is_edcol_admin request.user as is_editorial_admin %}
-<h2>Editorial Page for Submission</h2>
-<h1 class="text-primary">{{submission.title}}</h1>
-<h3>by {{submission.author_list}}</h3>
-
-<div class="ml-2 mt-2">
- <h3>- Go to the <a href="{% url 'submissions:submission' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">Submissions Page</a> to view Reports and Comments</h3>
-
- {% if submission.other_versions_pool or not submission.is_current %}
- <ul class="mt-3 mb-1 list-unstyled pl-4">
- {% if not submission.is_current %}
- <li>
- <h4><span class="text-danger"><b>This is not the editorial page for the current version.</b> Please go to the current version's page.</span></h4>
- </li>
- {% endif %}
-
- {% if submission.other_versions_pool %}
- <li>Other versions of this Submission exist:</li>
- <ul class="list-unstyled">
- {% for vn in submission.other_versions_pool %}
- <li>{% include 'submissions/_submission_version.html' with submission=vn editorial_page=1 %}</li>
- {% endfor %}
- </ul>
- {% endif %}
- </ul>
- {% endif %}
-</div>
+<div class="row">
+ <div class="col-md-8">
+ <h2>Editorial Page for Submission</h2>
+ <h1 class="text-primary">{{submission.title}}</h1>
+ <h3>by {{submission.author_list}}</h3>
+ <div class="ml-2 mt-2">
+ <h3>- Go to the <a href="{% url 'submissions:submission' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">Submissions Page</a> to view Reports and Comments</h3>
+ </div>
-<div class="row">
- <div class="col-12">
<h3 class="mt-4">Submission summary</h3>
{% include 'submissions/_submission_summary_short.html' with submission=submission hide_title=1 %}
@@ -73,11 +53,8 @@
<h3>Referees flagged upon submission (treat reports with caution):</h3>
<div class="pl-md-4">{{ submission.referees_flagged }}</div>
{% endif %}
- </div>
-</div>
-<div class="row">
- <div class="col-12">
+
{% for recommendation in submission.eicrecommendations.all %}
{% include 'submissions/_recommendation_author_content.html' with recommendation=recommendation %}
{% if recommendation.may_be_reformulated %}
@@ -85,8 +62,12 @@
{% endif %}
{% endfor %}
</div>
+ <div class="col-md-4">
+ {% include 'partials/submissions/submission_refereeing_history.html' with submission=submission %}
+ </div>
</div>
+
<div class="card card-grey my-4">
<div class="card-body">
<h2 class="card-title">Editorial Workflow</h2>
diff --git a/theses/forms.py b/theses/forms.py
index da91cf710bac5da9774880bee6ef696eaeec6ec0..e41bead8cc6d63181214e30fc03477e1916f6069 100644
--- a/theses/forms.py
+++ b/theses/forms.py
@@ -1,7 +1,6 @@
from django import forms
from django.core.mail import EmailMessage
from django.template.loader import render_to_string
-from django.urls import reverse
from scipost.models import Contributor
@@ -66,7 +65,7 @@ class VetThesisLinkForm(BaseRequestThesisLinkForm):
mail_params = {
'vocative_title': thesislink.requested_by.get_title_display(),
'thesislink': thesislink,
- 'full_url': thesislink.get_absolute_url()
+ 'full_url': 'https//www.scipost.org{url}'.format(url=thesislink.get_absolute_url())
}
action = int(self.cleaned_data['action_option'])