diff --git a/comments/forms.py b/comments/forms.py
index c691c8eabd89b26e98bd873b788b04aace60761b..ac922bb92967199688a976cdcac70dae74b08689 100644
--- a/comments/forms.py
+++ b/comments/forms.py
@@ -9,15 +9,20 @@ class CommentForm(forms.ModelForm):
model = Comment
fields = ['is_cor', 'is_rem', 'is_que', 'is_ans', 'is_obj',
'is_rep', 'is_val', 'is_lit', 'is_sug',
- 'comment_text', 'remarks_for_editors', 'file_attachment']
+ 'comment_text', 'remarks_for_editors', 'file_attachment',
+ 'anonymous']
def __init__(self, *args, **kwargs):
+ self.is_report_comment = kwargs.pop('is_report_comment', False)
super().__init__(*args, **kwargs)
self.fields['comment_text'].widget.attrs.update(
{'placeholder': 'NOTE: only serious and meaningful Comments will be accepted.'})
self.fields['remarks_for_editors'].widget.attrs.update(
{'rows': 3, 'placeholder': '(these remarks will not be publicly visible)'})
+ if not self.is_report_comment:
+ del self.fields['anonymous']
+
class VetCommentForm(forms.Form):
action_option = forms.ChoiceField(widget=forms.RadioSelect, choices=COMMENT_ACTION_CHOICES,
diff --git a/comments/templates/comments/_add_comment_form.html b/comments/templates/comments/_add_comment_form.html
index 35cd917d153f63e095f490cf2c99b49dfccae60b..8225e51af3c7c597a496901cf3505b347e02678c 100644
--- a/comments/templates/comments/_add_comment_form.html
+++ b/comments/templates/comments/_add_comment_form.html
@@ -52,6 +52,7 @@
<div class="row">
<div class="col-12">
+ {% if form.anonymous %}{{ form.anonymous|bootstrap }}{% endif %}
<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>, in particular that <span class="text-danger">your identity will be attached to the Comment</span>.</i></p>
</div>
diff --git a/comments/templates/comments/_comment_categories.html b/comments/templates/comments/_comment_categories.html
index 60b7720e7c5cdee801c81eb7f2157d55e027fec9..07e3c1d53072e4723c8baf86098421399d0dd48c 100644
--- a/comments/templates/comments/_comment_categories.html
+++ b/comments/templates/comments/_comment_categories.html
@@ -31,4 +31,5 @@
<div>suggestion for further work</div>
{% endif %}
</div>
+ <br>
{% endif %}
diff --git a/comments/templates/comments/_comment_identifier.html b/comments/templates/comments/_comment_identifier.html
index fa6faab3c4287f02ef037b74f9a324d506cf983e..2d518ecedeea4fe7dd83cdf87755bd40e115d019 100644
--- a/comments/templates/comments/_comment_identifier.html
+++ b/comments/templates/comments/_comment_identifier.html
@@ -1,25 +1,33 @@
{% load comment_extras %}
+{% load user_groups %}
+{% load submissions_extras %}
-<div class="commentid" id="comment_id{{comment.id}}">
- <h3>
- {% if comment.is_author_reply %}Author{% endif %}
+{% is_edcol_admin request.user as is_edcol_admin %}
- <a href="{{comment.author.get_absolute_url}}">{{comment.author.user.first_name}} {{comment.author.user.last_name}}</a>
- on {{comment.date_submitted|date:'Y-m-d'}}
+<div class="commentid" id="comment_id{{ comment.id }}">
+ <h3>
+ {% if request.user.contributor and request.user.contributor == comment.core_content_object.editor_in_charge or is_edcol_admin and request.user|is_not_author_of_submission:comment.core_content_object.arxiv_identifier_w_vn_nr %}
+ <h3>{% if comment.anonymous %}(chose public anonymity) {% endif %}<a href="{{ comment.author.get_absolute_url }}">{{ comment.author.user.first_name }} {{ comment.author.user.last_name }}</a>
+ on {{ comment.date_submitted|date:'Y-m-d' }}
+ </h3>
+ {% elif comment.anonymous %}
+ Anonymous on {{comment.date_submitted|date:'Y-m-d'}}
+ {% else %}
+ {% if comment.is_author_reply %}Author{% endif %}
+ <a href="{{comment.author.get_absolute_url}}">{{comment.author.user.first_name}} {{comment.author.user.last_name}}</a>
+ on {{comment.date_submitted|date:'Y-m-d'}}
+ {% endif %}
{% if comment.doi_string %} <small>doi: {{ comment.doi_string }}</small>{% endif %}
</h3>
{% if comment|is_reply_to_comment %}
- (in reply to <a href="{{comment.content_object.get_absolute_url}}">{{comment.content_object.author.user.first_name}} {{comment.content_object.author.user.last_name}}</a> on {{comment.content_object.date_submitted|date:'Y-m-d'}})
+ (in reply to <a href="{{comment.content_object.get_absolute_url}}">{% if comment.content_object.anonymous %}Anonymous Comment{% else %}{{comment.content_object.author.user.first_name}} {{comment.content_object.author.user.last_name}}{% endif %}</a> on {{comment.content_object.date_submitted|date:'Y-m-d'}})
{% elif comment|is_reply_to_report %}
- (in reply to <a href="{{comment.content_object.get_absolute_url}}">
+ (in reply to
- Report {{comment.content_object.report_nr}}
- {% if not comment.content_object.anonymous %}
- by {{comment.content_object.author.user.first_name}} {{comment.content_object.author.user.last_name}}
- {% endif %}
+ <a href="{{comment.content_object.get_absolute_url}}">Report {{comment.content_object.report_nr}}{% if not comment.content_object.anonymous %} by {{comment.content_object.author.user.first_name}} {{comment.content_object.author.user.last_name}}{% endif %}</a>
- </a> on {{comment.content_object.date_submitted|date:'Y-m-d'}})
+ on {{comment.content_object.date_submitted|date:'Y-m-d'}})
{% endif %}
</div>
diff --git a/comments/templates/comments/_single_comment.html b/comments/templates/comments/_single_comment.html
index ee94826ec7b15950249cc4f51465cee07fb6b5a4..665503b06852f4686845577dde1c1356898f831a 100644
--- a/comments/templates/comments/_single_comment.html
+++ b/comments/templates/comments/_single_comment.html
@@ -1,6 +1,10 @@
{% load scipost_extras %}
{% load filename %}
{% load file_extentions %}
+{% load user_groups %}
+
+{% is_edcol_admin request.user as is_edcol_admin %}
+{% is_editorial_college request.user as is_editorial_college %}
<div class="comment">
{% include 'comments/_comment_identifier.html' with comment=comment %}
@@ -25,7 +29,7 @@
</p>
{% endif %}
</p>
- {% if user|is_in_group:'Editorial College' or user|is_in_group:'Editorial Administrators' %}
+ {% if is_editorial_college or is_edcol_admin %}
{% if comment.remarks_for_editors %}
<h3>Remarks for editors:</h3>
<p>{{ comment.remarks_for_editors|linebreaks }}</p>
diff --git a/comments/views.py b/comments/views.py
index 9011315784e62cfeebc24c2d865e38b8a195b3c0..2de6693126a45ac20b03a1e8186879949c06609b 100644
--- a/comments/views.py
+++ b/comments/views.py
@@ -181,7 +181,7 @@ def reply_to_report(request, report_id):
# Verify if this is from an author:
is_author = report.submission.authors.filter(user=request.user).exists()
- form = CommentForm(request.POST or None, request.FILES or None)
+ form = CommentForm(request.POST or None, request.FILES or None, is_report_comment=True)
if form.is_valid():
newcomment = form.save(commit=False)
newcomment.content_object = report
diff --git a/journals/constants.py b/journals/constants.py
index bc5554b2b0dc43a9e9b1fb966da2d0f37c6b7af8..da5c678eae99d18964113ca71b204208c397769e 100644
--- a/journals/constants.py
+++ b/journals/constants.py
@@ -14,7 +14,6 @@ SCIPOST_JOURNALS_SUBMIT = (
# Journal closed for submission
SCIPOST_JOURNALS_NO_SUBMIT = (
(SCIPOST_JOURNAL_PHYSICS_SELECT, 'SciPost Physics Select'),
- (SCIPOST_JOURNAL_PHYSICS_PROC, 'SciPost Physics Proceedings'),
)
# All allowed journals
diff --git a/journals/migrations/0053_auto_20171114_1255.py b/journals/migrations/0053_auto_20171114_1255.py
new file mode 100644
index 0000000000000000000000000000000000000000..77b99bccdf9ad300a49f35f8dcd3389ae7dd4211
--- /dev/null
+++ b/journals/migrations/0053_auto_20171114_1255.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2017-11-14 11:55
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('journals', '0052_auto_20171107_1354'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='journal',
+ name='name',
+ field=models.CharField(choices=[('SciPostPhys', 'SciPost Physics'), ('SciPostPhysLectNotes', 'SciPost Physics Lecture Notes'), ('SciPostPhysProc', 'SciPost Physics Proceedings'), ('SciPostPhysSel', 'SciPost Physics Select')], max_length=100, unique=True),
+ ),
+ ]
diff --git a/journals/views.py b/journals/views.py
index 8f7b60053f6b2efb3fa50f35b6a5f1be360103fc..d1428b475ea226833e3b5015ccf790dc0c456af6 100644
--- a/journals/views.py
+++ b/journals/views.py
@@ -256,8 +256,8 @@ def validate_publication(request):
# Add Institutions to the publication
for author in publication.authors.all():
- for institution in author.affiliations.active():
- publication.institutions.add(institution)
+ for current_affiliation in author.affiliations.active():
+ publication.institutions.add(current_affiliation.institution)
# Save the beast
publication.save()
@@ -921,8 +921,11 @@ def harvest_citedby_links(request, doi_label):
for link in response_deserialized.iter(prefix + 'forward_link'):
doi = link.find(prefix + 'journal_cite').find(prefix + 'doi').text
article_title = link.find(prefix + 'journal_cite').find(prefix + 'article_title').text
- journal_abbreviation = link.find(prefix + 'journal_cite').find(
- prefix + 'journal_abbreviation').text
+ try:
+ journal_abbreviation = link.find(prefix + 'journal_cite').find(
+ prefix + 'journal_abbreviation').text
+ except:
+ journal_abbreviation = None
try:
volume = link.find(prefix + 'journal_cite').find(prefix + 'volume').text
except AttributeError:
diff --git a/mails/templates/mail_templates/registration_invitation_renewal.html b/mails/templates/mail_templates/registration_invitation_renewal.html
index 2ab987e684383e835b8e237c99ed77fa696237a5..70cefdbf0c36128c5b7a928b3c32229871dd5813 100644
--- a/mails/templates/mail_templates/registration_invitation_renewal.html
+++ b/mails/templates/mail_templates/registration_invitation_renewal.html
@@ -48,7 +48,7 @@
Your work has been cited in a manuscript submitted to SciPost, {{ invitation.cited_in_submission.title }} <br>by {{ invitation.cited_in_submission.author_list }}, <br>
which you can find online at the
<a href="https://scipost.org/submission/{{ invitation.cited_in_submission.arxiv_identifier_w_vn_nr }}">
- submission\'s page</a>.
+ submission's page</a>.
</p>
<p>
I would hereby like to use this opportunity to quickly introduce
@@ -76,20 +76,20 @@
<p>
As a professional academic, you can register at the
<a href="https://scipost.org/register">registration page</a>,
- enabling you to contribute to the site\'s '
+ enabling you to contribute to the site's
contents, for example by offering submissions, reports and comments.
</p>
<p>
For your convenience, a partly pre-filled
<a href="https://scipost.org/invitation/{{ invitation_key }}">registration form</a>
has been prepared for you (you can in any case still register at the
- <a href="https://scipost.org/register">registration page</a>.
+ <a href="https://scipost.org/register">registration page</a>).
</p>
<p>
If you do develop sympathy for the initiative, besides participating in the
online platform, we would be very grateful if you considered submitting a
publication to one of the journals within the near future, in order to help
- establish their reputation. We\'ll also be looking forward to your reaction,
+ establish their reputation. We'll also be looking forward to your reaction,
comments and suggestions about the initiative, which we hope you will find
useful to your work as a professional scientist.
</p>
@@ -100,7 +100,7 @@
{% elif invitation.invitation_type == 'cp' %}
<p>Your work has been cited in a paper published by SciPost,</p>
<p>
- {{ invitation.cited_in_publication.title }}</p> <p>by {{ invitation.cited_in_publication.author_list }} (published as <a href="https://scipost.org/{{ invitation.cited_in_publication.doi_label }}">{{ invitation.cited_in_publication.citation }}</a>.
+ {{ invitation.cited_in_publication.title }}</p> <p>by {{ invitation.cited_in_publication.author_list }} (published as <a href="https://scipost.org/{{ invitation.cited_in_publication.doi_label }}">{{ invitation.cited_in_publication.citation }}</a>).
</p>
<p>
I would hereby like to use this opportunity to quickly introduce
@@ -127,7 +127,7 @@
<p>
As a professional academic, you can register at the
<a href="https://scipost.org/register">registration page</a>,
- enabling you to contribute to the site\'s '
+ enabling you to contribute to the site's
contents, for example by offering submissions, reports and comments.
</p>
<p>
@@ -140,7 +140,7 @@
If you do develop sympathy for the initiative, besides participating in the
online platform, we would be very grateful if you considered submitting a
publication to one of the journals within the near future, in order to help
- establish their reputation. We\'ll also be looking forward to your reaction,
+ establish their reputation. We'll also be looking forward to your reaction,
comments and suggestions about the initiative, which we hope you will find
useful to your work as a professional scientist.
</p>
@@ -174,7 +174,7 @@
<p>
As a professional academic, you can register at the
<a href="https://scipost.org/register">registration page</a>,
- enabling you to contribute to the site\'s '
+ enabling you to contribute to the site's
contents, for example by offering submissions, reports and comments.
</p>
<p>
@@ -187,7 +187,7 @@
If you do develop sympathy for the initiative, besides participating in the
online platform, we would be very grateful if you considered submitting a
publication to one of the journals within the near future, in order to help
- establish their reputation. We\'ll also be looking forward to your reaction,
+ establish their reputation. We'll also be looking forward to your reaction,
comments and suggestions about the initiative, which we hope you will find
useful to your work as a professional scientist.
</p>
@@ -243,7 +243,7 @@
</p>
<p>
Since the success of this initiative is dependent on the involvement of
- the very people it is meant to serve, we\'d be very grateful if you were
+ the very people it is meant to serve, we'd be very grateful if you were
to give due consideration to this proposal. We would expect you to
commit just 2-4 hours per month to help perform Editorial duties; we will
constantly adjust the number of Editorial Fellows to ensure this is the case. You
@@ -266,7 +266,8 @@
<br/>University of Amsterdam
<br/>Science Park 904<br/>1098 XH Amsterdam<br/>The Netherlands
<br/>---------------------------------------------
- <br/>tel.: +31 (0)20 5255775\nfax: +31 (0)20 5255778
+ <br/>tel.: +31 (0)20 5255775
+ <bf/>fax: +31 (0)20 5255778
<br/>---------------------------------------------
</p>
{% endif %}
diff --git a/scipost/static/scipost/assets/css/_buttons.scss b/scipost/static/scipost/assets/css/_buttons.scss
index 4c1d9d4bbd2619b9bc50d7eed5980df0e7b3671a..6abdc7c02b81ac4c4a9c4d8ce9cc82c87f0ef977 100644
--- a/scipost/static/scipost/assets/css/_buttons.scss
+++ b/scipost/static/scipost/assets/css/_buttons.scss
@@ -39,13 +39,13 @@
.voting-group {
border-radius: $card-border-radius;
color: $scipost-darkblue;
- box-shadow: 0 1px 0 0 $gray-600;
+ border: 1px solid $gray-600;
> div {
padding: 0.25rem 0.5rem;
font-size: 0.8rem;
border-radius: 0;
- line-height: 1.25;
+ line-height: 1;
margin: 0;
display: inline-block;
color: #002b49;
@@ -98,3 +98,12 @@
}
}
}
+
+.category-group {
+ display: inline-block;
+ margin-bottom: 0.5rem;
+
+ > div {
+ line-height: 1.3;
+ }
+}
diff --git a/scipost/templates/scipost/_draft_registration_tables.html b/scipost/templates/scipost/_draft_registration_tables.html
index 803c89594f72b8fdaf025c1607e08cb47dbd6322..76765d3f3e4b824531631a0ed6349fc29c29c4aa 100644
--- a/scipost/templates/scipost/_draft_registration_tables.html
+++ b/scipost/templates/scipost/_draft_registration_tables.html
@@ -21,6 +21,7 @@
<tr>
<td>{{ fellow.last_name }}</td>
<td>{{ fellow.first_name }}</td>
+ <td>{{ fellow.get_title_display }}</td>
<td>{{ fellow.email }}</td>
<td>{{ fellow.date_sent }} </td>
<td>{{ fellow.get_invitation_type_display }}</td>
@@ -50,6 +51,7 @@
<tr>
<th>Last name</th>
<th>First name</th>
+ <th>Title</th>
<th>Email</th>
<th>Date sent</th>
<th>Type</th>
@@ -62,6 +64,7 @@
<tr>
<td>{{ invitation.last_name }}</td>
<td>{{ invitation.first_name }}</td>
+ <td>{{ invitation.get_title_display }}</td>
<td>{{ invitation.email }}</td>
<td>{{ invitation.date_sent }} </td>
<td>{{ invitation.get_invitation_type_display }}</td>
@@ -91,6 +94,7 @@
<tr>
<th>Last name</th>
<th>First name</th>
+ <th>Title</th>
<th>Email</th>
<th>Date sent</th>
<th>Type</th>
@@ -103,6 +107,7 @@
<tr>
<td>{{ invitation.last_name }}</td>
<td>{{ invitation.first_name }}</td>
+ <td>{{ invitation.get_title_display }}</td>
<td>{{ invitation.email }}</td>
<td>{{ invitation.date_sent }} </td>
<td>{{ invitation.get_invitation_type_display }}</td>
@@ -129,6 +134,7 @@
<tr>
<th>Last name</th>
<th>First name</th>
+ <th>Title</th>
<th>Email</th>
<th>Date sent</th>
<th>Type</th>
@@ -141,6 +147,7 @@
<tr>
<td>{{ invitation.last_name }}</td>
<td>{{ invitation.first_name }}</td>
+ <td>{{ invitation.get_title_display }}</td>
<td>{{ invitation.email }}</td>
<td>{{ invitation.date_sent }} </td>
<td>{{ invitation.get_invitation_type_display }}</td>
@@ -168,6 +175,7 @@
<tr>
<th>Last name</th>
<th>First name</th>
+ <th>Title</th>
<th>Email</th>
<th>Date sent</th>
<th>Type</th>
@@ -180,6 +188,7 @@
<tr>
<td>{{ invitation.last_name }}</td>
<td>{{ invitation.first_name }}</td>
+ <td>{{ invitation.get_title_display }}</td>
<td>{{ invitation.email }}</td>
<td>{{ invitation.date_sent }} </td>
<td>{{ invitation.get_invitation_type_display }}</td>
@@ -208,6 +217,7 @@
<tr>
<th>Last name</th>
<th>First name</th>
+ <th>Title</th>
<th>Email</th>
<th>Date sent</th>
<th>Type</th>
@@ -219,6 +229,7 @@
<tr>
<td>{{ invitation.last_name }}</td>
<td>{{ invitation.first_name }}</td>
+ <td>{{ invitation.get_title_display }}</td>
<td>{{ invitation.email }}</td>
<td>{{ invitation.date_sent }} </td>
<td>{{ invitation.get_invitation_type_display }}</td>
@@ -240,6 +251,7 @@
<tr>
<th>Last name</th>
<th>First name</th>
+ <th>Title</th>
<th>Email</th>
<th>Date sent</th>
<th>Type</th>
@@ -251,6 +263,7 @@
<tr>
<td>{{ invitation.last_name }}</td>
<td>{{ invitation.first_name }}</td>
+ <td>{{ invitation.get_title_display }}</td>
<td>{{ invitation.email }}</td>
<td>{{ invitation.date_sent }} </td>
<td>{{ invitation.get_invitation_type_display }}</td>
@@ -272,6 +285,7 @@
<tr>
<th>Last name</th>
<th>First name</th>
+ <th>Title</th>
<th>Email</th>
<th>Date sent</th>
<th>Type</th>
@@ -283,6 +297,7 @@
<tr>
<td>{{ invitation.last_name }}</td>
<td>{{ invitation.first_name }}</td>
+ <td>{{ invitation.get_title_display }}</td>
<td>{{ invitation.email }}</td>
<td>{{ invitation.date_sent }} </td>
<td>{{ invitation.get_invitation_type_display }}</td>
@@ -304,6 +319,7 @@
<tr>
<th>Last name</th>
<th>First name</th>
+ <th>Title</th>
<th>Email</th>
<th>Date sent</th>
<th>Type</th>
@@ -315,6 +331,7 @@
<tr>
<td>{{ invitation.last_name }}</td>
<td>{{ invitation.first_name }}</td>
+ <td>{{ invitation.get_title_display }}</td>
<td>{{ invitation.email }}</td>
<td>{{ invitation.date_sent }} </td>
<td>{{ invitation.get_invitation_type_display }}</td>
@@ -336,6 +353,7 @@
<tr>
<th>Last name</th>
<th>First name</th>
+ <th>Title</th>
<th>Email</th>
<th>Date sent</th>
<th>Type</th>
@@ -347,6 +365,7 @@
<tr>
<td>{{ invitation.last_name }}</td>
<td>{{ invitation.first_name }}</td>
+ <td>{{ invitation.get_title_display }}</td>
<td>{{ invitation.email }}</td>
<td>{{ invitation.date_sent }} </td>
<td>{{ invitation.get_invitation_type_display }}</td>
@@ -368,6 +387,7 @@
<tr>
<th>Last name</th>
<th>First name</th>
+ <th>Title</th>
<th>Email</th>
<th>Date sent</th>
<th>Type</th>
@@ -379,6 +399,7 @@
<tr>
<td>{{ invitation.last_name }}</td>
<td>{{ invitation.first_name }}</td>
+ <td>{{ invitation.get_title_display }}</td>
<td>{{ invitation.email }}</td>
<td>{{ invitation.date_sent }} </td>
<td>{{ invitation.get_invitation_type_display }}</td>
diff --git a/submissions/templates/submissions/_single_public_report.html b/submissions/templates/submissions/_single_public_report.html
index efdc5c5144fb7f7dde0959338e2d3c9b751582b4..c39fcdc22220cb2a003b96a637c94a49f6f19fca 100644
--- a/submissions/templates/submissions/_single_public_report.html
+++ b/submissions/templates/submissions/_single_public_report.html
@@ -6,6 +6,10 @@
<h3><a href="{% url 'comments:reply_to_report' report_id=report.id %}">Reply to this Report</a> (authors only)</h3>
{% endif %}
+ {% if report.comments.vetted.exists %}
+ <br>
+ {% endif %}
+
{% for reply in report.comments.vetted %}
{% include 'comments/_single_comment_with_link.html' with comment=reply perms=perms user=user %}
{% endfor %}
diff --git a/submissions/templates/submissions/pool/pool.html b/submissions/templates/submissions/pool/pool.html
index 1607a04b15df42d6a004b7d1b9cc40f7413ee628..065b4f6f0ca9a687484f69e73cab75b6166c264b 100644
--- a/submissions/templates/submissions/pool/pool.html
+++ b/submissions/templates/submissions/pool/pool.html
@@ -27,7 +27,7 @@
<h1>SciPost Submissions Pool</h1>
{% if is_ECAdmin %}
- {% if recommendations.voting_in_preparation.exists or recommendations.put_to_voting.exists %}
+ {% if recommendations.voting_in_preparation.exists or recommendations.put_to_voting.exists or latest_submission_events %}
<div class="quote-border">
<h2 class="text-primary">Administrative Tasks</h2>
@@ -53,7 +53,14 @@
{% endfor %}
</ul>
{% endif %}
+ {% if latest_submission_events %}
+ <a href="javascript:void(0)" class="btn" data-toggle="toggle" data-target="#lastest_events_list"><i class="fa fa-comments-o"></i> View/hide latest events ({{ latest_submission_events|length }}) in the last 24 hours</a>
+ <div id="lastest_events_list" style="display: none;">
+ {% include 'submissions/submission_event_list_general.html' with events=latest_submission_events %}
+ </div>
+ {% endif %}
</div>
+ <br>
{% endif %}
{% endif %}
diff --git a/submissions/templatetags/submissions_extras.py b/submissions/templatetags/submissions_extras.py
index 9cb66171d072b47b057a2a2b6e79817614db882c..d98be57a13f124f628b54f7e016404de300fd475 100644
--- a/submissions/templatetags/submissions_extras.py
+++ b/submissions/templatetags/submissions_extras.py
@@ -21,6 +21,7 @@ def is_viewable_by_authors(recommendation):
'accepted', 'rejected',
'published', 'withdrawn']
+
@register.filter
def user_is_referee(submission, user):
return submission.referee_invitations.filter(referee__user=user).exists()
diff --git a/submissions/views.py b/submissions/views.py
index a8d12ce41147f6943d1532d5f21429b55c5bcb8c..24564a1a2ace125c92c93abc6596a82ddb05e2e0 100644
--- a/submissions/views.py
+++ b/submissions/views.py
@@ -387,7 +387,7 @@ def pool(request, arxiv_identifier_w_vn_nr=None):
# EdColAdmin related variables
if request.user.has_perm('scipost.can_oversee_refereeing'):
- context['latest_events'] = SubmissionEvent.objects.for_eic().last_hours()
+ context['latest_submission_events'] = SubmissionEvent.objects.for_eic().last_hours()
# Temporary test logic: only testers see the new Pool
if context['submission'] and request.is_ajax():