diff --git a/commentaries/factories.py b/commentaries/factories.py
index 1f0110a5d0a44caa1ffb3519f8f86a3703a2871d..978352975fff10fa564883dbf0388a2e0ebbcda3 100644
--- a/commentaries/factories.py
+++ b/commentaries/factories.py
@@ -20,7 +20,7 @@ class CommentaryFactory(factory.django.DjangoModelFactory):
discipline = factory.Iterator(SCIPOST_DISCIPLINES, getter=lambda c: c[0])
domain = factory.Iterator(SCIPOST_JOURNALS_DOMAINS, getter=lambda c: c[0])
subject_area = factory.Iterator(SCIPOST_SUBJECT_AREAS[0][1], getter=lambda c: c[0])
- pub_title = factory.Faker('text')
+ title = factory.Faker('text')
pub_DOI = factory.Sequence(lambda n: random_external_doi())
arxiv_identifier = factory.Sequence(lambda n: random_arxiv_identifier_with_version_number())
author_list = factory.Faker('name')
@@ -60,6 +60,7 @@ class UnpublishedVettedCommentaryFactory(VettedCommentaryFactory):
class UnvettedCommentaryFactory(CommentaryFactory):
vetted = False
+
class UnvettedArxivPreprintCommentaryFactory(CommentaryFactory):
vetted = False
- pub_DOI = None
+ pub_DOI = ''
diff --git a/commentaries/forms.py b/commentaries/forms.py
index 4e77b521a054eae82330c8b8e2f61a2099e01475..ce198737a14d3e2e06dc19a59946bbb4edb85d2c 100644
--- a/commentaries/forms.py
+++ b/commentaries/forms.py
@@ -90,7 +90,7 @@ class RequestCommentaryForm(forms.ModelForm):
class Meta:
model = Commentary
fields = [
- 'discipline', 'domain', 'subject_area', 'pub_title',
+ 'discipline', 'domain', 'subject_area', 'title',
'author_list', 'pub_date', 'pub_abstract'
]
placeholders = {
@@ -272,7 +272,7 @@ class VetCommentaryForm(forms.Form):
# Modified actions are not doing anything. Users are redirected to an edit page instead.
if self.commentary_is_accepted():
self.commentary.vetted = True
- self.commentary.vetted_by = Contributor.objects.get(user=self.user)
+ self.commentary.vetted_by = self.user.contributor
self.commentary.save()
return self.commentary
elif self.commentary_is_refused():
@@ -289,6 +289,6 @@ class CommentarySearchForm(forms.Form):
def search_results(self):
"""Return all Commentary objects according to search"""
return Commentary.objects.vetted(
- pub_title__icontains=self.cleaned_data['title'],
+ title__icontains=self.cleaned_data['title'],
pub_abstract__icontains=self.cleaned_data['abstract'],
author_list__icontains=self.cleaned_data['author']).order_by('-pub_date')
diff --git a/commentaries/migrations/0017_auto_20170728_1901.py b/commentaries/migrations/0017_auto_20170728_1901.py
new file mode 100644
index 0000000000000000000000000000000000000000..4965029020dcd247aa1d12d87794b5e96c09760a
--- /dev/null
+++ b/commentaries/migrations/0017_auto_20170728_1901.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-07-28 17:01
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('commentaries', '0016_auto_20170726_1616'),
+ ]
+
+ operations = [
+ migrations.RenameField(
+ model_name='commentary',
+ old_name='pub_title',
+ new_name='title',
+ ),
+ ]
diff --git a/commentaries/models.py b/commentaries/models.py
index a1c41fdafe2c0f6b3e88388371ed69c39c18e81b..a6176b57643f971bd840014227ff795e9cfb53cd 100644
--- a/commentaries/models.py
+++ b/commentaries/models.py
@@ -1,11 +1,11 @@
from django.db import models
+from django.contrib.contenttypes.fields import GenericRelation
from django.contrib.postgres.fields import JSONField
from django.core.urlresolvers import reverse
from django.template import Template, Context
from journals.constants import SCIPOST_JOURNALS_DOMAINS
from scipost.behaviors import TimeStampedModel
-from scipost.models import Contributor
from scipost.constants import SCIPOST_DISCIPLINES, DISCIPLINE_PHYSICS, SCIPOST_SUBJECT_AREAS
from .constants import COMMENTARY_TYPES
@@ -28,7 +28,7 @@ class Commentary(TimeStampedModel):
subject_area = models.CharField(max_length=10, choices=SCIPOST_SUBJECT_AREAS,
default='Phys:QP')
open_for_commenting = models.BooleanField(default=True)
- pub_title = models.CharField(max_length=300, verbose_name='title')
+ title = models.CharField(max_length=300, verbose_name='title')
arxiv_identifier = models.CharField(max_length=100, blank=True,
verbose_name="arXiv identifier (including version nr)")
arxiv_link = models.URLField(verbose_name='arXiv link (including version nr)', blank=True)
@@ -57,13 +57,16 @@ class Commentary(TimeStampedModel):
blank=True, null=True)
pub_abstract = models.TextField(verbose_name='abstract')
+ # Comments can be added to a Commentary
+ comments = GenericRelation('comments.Comment', related_query_name='commentaries')
+
objects = CommentaryManager()
class Meta:
verbose_name_plural = 'Commentaries'
def __str__(self):
- return self.pub_title
+ return self.title
def get_absolute_url(self):
return reverse('commentaries:commentary', args=(self.arxiv_or_DOI_string,))
@@ -71,9 +74,9 @@ class Commentary(TimeStampedModel):
def title_label(self):
context = Context({
'scipost_url': reverse('commentaries:commentary', args=(self.arxiv_or_DOI_string,)),
- 'pub_title': self.pub_title
+ 'title': self.title
})
- template = Template('<a href="{{scipost_url}}" class="pubtitleli">{{pub_title}}</a>')
+ template = Template('<a href="{{scipost_url}}" class="pubtitleli">{{title}}</a>')
return template.render(context)
def parse_links_into_urls(self, commit=False):
diff --git a/commentaries/templates/commentaries/_commentary_card_content.html b/commentaries/templates/commentaries/_commentary_card_content.html
index a00cd4ca86eda5aeae8d6dd1be4e027158de80b0..51a1a1a1b564cdf0340184576be620ef145512ea 100644
--- a/commentaries/templates/commentaries/_commentary_card_content.html
+++ b/commentaries/templates/commentaries/_commentary_card_content.html
@@ -1,6 +1,6 @@
<div class="card-block">
<h3 class="card-title">
- <a href="{% url 'commentaries:commentary' commentary.arxiv_or_DOI_string %}">{{ commentary.pub_title }}</a>
+ <a href="{% url 'commentaries:commentary' commentary.arxiv_or_DOI_string %}">{{ commentary.title }}</a>
</h3>
<p class="card-text">
by {{ commentary.author_list }}{% if commentary.type == 'published' %}, {{ commentary.journal }} {{ commentary.volume }}, {{ commentary.pages }}{% elif commentary.type == 'preprint' %} - <a href="{{ commentary.arxiv_link }}">{{ commentary.arxiv_link }}</a>{% endif %}
diff --git a/commentaries/templates/commentaries/_commentary_summary.html b/commentaries/templates/commentaries/_commentary_summary.html
index be9db8316e26049b3d925a5d52d3886e564b0ccc..914dd82eadc074a2b44a9ca2c396aa7837c2fbe3 100644
--- a/commentaries/templates/commentaries/_commentary_summary.html
+++ b/commentaries/templates/commentaries/_commentary_summary.html
@@ -1,7 +1,7 @@
<table class="commentary summary">
<tr>
<td>Title:</td>
- <td>{{commentary.pub_title}}</td>
+ <td>{{commentary.title}}</td>
</tr>
<tr>
<td>Author(s):</td>
diff --git a/commentaries/templates/commentaries/commentary_detail.html b/commentaries/templates/commentaries/commentary_detail.html
index 5b47e90f8844ea97816973ff8de2271abd9a271c..ad8cee7adb14d5cf208ef086a3dc79d3065cfe17 100644
--- a/commentaries/templates/commentaries/commentary_detail.html
+++ b/commentaries/templates/commentaries/commentary_detail.html
@@ -6,25 +6,6 @@
{% load scipost_extras %}
-<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>
-
{% endblock headsup %}
{% block content %}
@@ -49,7 +30,7 @@
</div>
</div>
-{% include 'scipost/comments_block.html' %}
+{% include 'scipost/comments_block.html' with comments=commentary.comments.vetted type_of_object='Commentary' %}
{% include 'comments/new_comment.html' with object_id=commentary.id type_of_object='commentary' open_for_commenting=commentary.open_for_commenting %}
diff --git a/commentaries/templates/commentaries/vet_commentary_email_accepted.html b/commentaries/templates/commentaries/vet_commentary_email_accepted.html
index 7c5056b8e24c8cdb402c3cfafb8801684f8e2a2f..cc92f551efbeea589b1df655eb6f1610cafda868 100644
--- a/commentaries/templates/commentaries/vet_commentary_email_accepted.html
+++ b/commentaries/templates/commentaries/vet_commentary_email_accepted.html
@@ -1,6 +1,6 @@
Dear {{commentary.requested_by.get_title}} {{commentary.requested_by.user.last_name}},
-The Commentary Page you have requested, concerning publication with title {{commentary.pub_title}} by {{commentary.author_list}}, has been activated at https://scipost.org/commentary/{{commentary.arxiv_or_DOI_string}}.
+The Commentary Page you have requested, concerning publication with title {{commentary.title}} by {{commentary.author_list}}, has been activated at https://scipost.org/commentary/{{commentary.arxiv_or_DOI_string}}.
You are now welcome to submit your comments.
Thank you for your contribution,
diff --git a/commentaries/templates/commentaries/vet_commentary_email_modified.html b/commentaries/templates/commentaries/vet_commentary_email_modified.html
index f3ad85365c4ab2f4398dc9b9e644aeece54b7559..fa419f41fc6c3904cedfbe12892b16e16e05bd0d 100644
--- a/commentaries/templates/commentaries/vet_commentary_email_modified.html
+++ b/commentaries/templates/commentaries/vet_commentary_email_modified.html
@@ -1,6 +1,6 @@
Dear {{commentary.requested_by.get_title}} {{commentary.requested_by.user.last_name}},
-The Commentary Page you have requested, concerning publication with title {{commentary.pub_title}} by {{commentary.author_list}}, has been activated (with slight modifications to your submitted details).
+The Commentary Page you have requested, concerning publication with title {{commentary.title}} by {{commentary.author_list}}, has been activated (with slight modifications to your submitted details).
You are now welcome to submit your comments.
Thank you for your contribution,
diff --git a/commentaries/templates/commentaries/vet_commentary_email_rejected.html b/commentaries/templates/commentaries/vet_commentary_email_rejected.html
index b9d99fade03b2a34cfcb59728285f97b7e677c61..0273fb35bd9b7ec36071a1e179698f9de15f01eb 100644
--- a/commentaries/templates/commentaries/vet_commentary_email_rejected.html
+++ b/commentaries/templates/commentaries/vet_commentary_email_rejected.html
@@ -1,6 +1,6 @@
Dear {{commentary.requested_by.get_title}} {{commentary.requested_by.user.last_name}},
-The Commentary Page you have requested, concerning publication with title {{commentary.pub_title}} by {{commentary.author_list}}, has not been activated for the following reason: {{refusal_reason}}.
+The Commentary Page you have requested, concerning publication with title {{commentary.title}} by {{commentary.author_list}}, has not been activated for the following reason: {{refusal_reason}}.
{% if further_explanation %}
Further explanations:
diff --git a/commentaries/test_forms.py b/commentaries/test_forms.py
index 64d6fda33f5bb8bcb968d89dd17567becdbf6bef..35e65abb64b3b50ed5f3aca96a9a65dbefce65a5 100644
--- a/commentaries/test_forms.py
+++ b/commentaries/test_forms.py
@@ -101,14 +101,13 @@ class TestVetCommentaryForm(TestCase):
add_groups_and_permissions()
ContributorFactory.create_batch(5)
self.commentary = UnvettedCommentaryFactory.create()
- self.user = UserFactory()
+ self.user = UserFactory.create()
self.form_data = {
'action_option': VetCommentaryForm.ACTION_ACCEPT,
'refusal_reason': VetCommentaryForm.REFUSAL_EMPTY,
'email_response_field': 'Lorem Ipsum'
}
-
def test_valid_accepted_form(self):
"""Test valid form data and return Commentary"""
form = VetCommentaryForm(self.form_data, commentary_id=self.commentary.id, user=self.user)
@@ -127,7 +126,7 @@ class TestVetCommentaryForm(TestCase):
form = VetCommentaryForm(self.form_data, commentary_id=self.commentary.id, user=self.user)
self.assertTrue(form.is_valid())
self.assertFalse(Commentary.objects.vetted().exists())
- self.assertTrue(Commentary.objects.awaiting_vetting().exists())
+ self.assertTrue(Commentary.objects.awaiting_vetting().count() == 1)
# Delete the Commentary
form.process_commentary()
@@ -156,7 +155,7 @@ class TestVetCommentaryForm(TestCase):
def test_process_before_validation(self):
"""Test response of form on processing before validation"""
form = VetCommentaryForm(self.form_data, commentary_id=self.commentary.id, user=self.user)
- self.assertRaises(ValueError, form.process_commentary)
+ self.assertRaises(AttributeError, form.process_commentary)
class TestRequestPublishedArticleForm(TestCase):
diff --git a/commentaries/views.py b/commentaries/views.py
index 5bf4f0ef87745667375a2fa15a4c79d2dc4ac544..d638ff79a70e9cdcc43b8d7acf2250ec48fefc3b 100644
--- a/commentaries/views.py
+++ b/commentaries/views.py
@@ -3,7 +3,6 @@ from django.contrib import messages
from django.contrib.auth.decorators import permission_required
from django.core.mail import EmailMessage
from django.core.urlresolvers import reverse, reverse_lazy
-from django.db.models import Q
from django.shortcuts import redirect
from django.template.loader import render_to_string
from django.views.generic.edit import CreateView
@@ -207,12 +206,7 @@ class CommentaryListView(ListView):
context = super().get_context_data(**kwargs)
# Get newest comments
- context['comment_list'] = (Comment.objects.vetted()
- .filter(Q(commentary__isnull=False) |
- Q(submission__isnull=False) |
- Q(thesislink__isnull=False))
- .select_related('author__user', 'submission', 'commentary')
- .order_by('-date_submitted')[:10])
+ context['comment_list'] = Comment.objects.vetted().order_by('-date_submitted')[:10]
# Form into the context!
context['form'] = self.form
@@ -232,7 +226,6 @@ def commentary_detail(request, arxiv_or_DOI_string):
commentary = get_object_or_404(Commentary.objects.vetted(),
arxiv_or_DOI_string=arxiv_or_DOI_string)
- comments = commentary.comment_set.all()
form = CommentForm()
try:
author_replies = Comment.objects.filter(
@@ -240,6 +233,5 @@ def commentary_detail(request, arxiv_or_DOI_string):
except Comment.DoesNotExist:
author_replies = ()
context = {'commentary': commentary,
- 'comments': comments.filter(status__gte=1).order_by('-date_submitted'),
'author_replies': author_replies, 'form': form}
return render(request, 'commentaries/commentary_detail.html', context)
diff --git a/comments/factories.py b/comments/factories.py
index d74370a136d4a140fd82e8f6d060acf6497526b4..1f76cf6a460001cb60077d1d5e73bdf075dd2c6a 100644
--- a/comments/factories.py
+++ b/comments/factories.py
@@ -31,16 +31,16 @@ class CommentFactory(factory.django.DjangoModelFactory):
class CommentaryCommentFactory(CommentFactory):
- commentary = factory.SubFactory(VettedCommentaryFactory)
+ content_object = factory.SubFactory(VettedCommentaryFactory)
class SubmissionCommentFactory(CommentFactory):
- submission = factory.SubFactory(EICassignedSubmissionFactory)
+ content_object = factory.SubFactory(EICassignedSubmissionFactory)
class ThesislinkCommentFactory(CommentFactory):
- thesislink = factory.SubFactory(VettedThesisLinkFactory)
+ content_object = factory.SubFactory(VettedThesisLinkFactory)
class ReplyCommentFactory(CommentFactory):
- in_reply_to_comment = factory.SubFactory(SubmissionCommentFactory)
+ content_object = factory.SubFactory(SubmissionCommentFactory)
diff --git a/comments/forms.py b/comments/forms.py
index 8aace94b0c36586c54abc63509f04588f093ff64..94b6fa62fefff353346ba27926df9aaa7f7e1ebb 100644
--- a/comments/forms.py
+++ b/comments/forms.py
@@ -3,9 +3,6 @@ from django import forms
from .constants import COMMENT_ACTION_CHOICES, COMMENT_REFUSAL_CHOICES
from .models import Comment
-from crispy_forms.helper import FormHelper
-from crispy_forms.layout import Layout, Div, Field, Fieldset, HTML, Submit
-
class CommentForm(forms.ModelForm):
class Meta:
@@ -20,34 +17,6 @@ class CommentForm(forms.ModelForm):
{'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)'})
- self.helper = FormHelper()
- self.helper.layout = Layout(
- Div(
- Div(
- Field('comment_text'),
- HTML('<p>In your comment, you can use LaTeX \$...\$ for in-text '
- 'equations or \ [ ... \ ] for on-line equations.</p>'),
- HTML('<p id="goodCommenter"><i>Be professional. Only serious and '
- 'meaningful comments will be vetted through.</i></p><br/>'),
- Field('remarks_for_editors'),
- css_class="col-md-9"),
- Div(
- Fieldset(
- 'Specify categorization(s):',
- 'is_cor', 'is_rem', 'is_que', 'is_ans', 'is_obj',
- 'is_rep', 'is_val', 'is_lit', 'is_sug',
- style="border: 0px; font-size: 90%"),
- HTML('<br>'),
- Div(
- Submit('submit', 'Submit your Comment for vetting',
- css_class="submitButton"),
- HTML('<p id="goodCommenter"><i>By clicking on Submit, you agree with the '
- '<a href="{% url \'scipost:terms_and_conditions\' %}">'
- 'Terms and Conditions</a>.</i></p>'),
- ),
- css_class="col-md-3"),
- css_class="row"),
- )
class VetCommentForm(forms.Form):
diff --git a/comments/managers.py b/comments/managers.py
index 37f5baef8c803436d56818518ac4549b85514756..70e6f20693fb1986569befa36a54852d8e130d1f 100644
--- a/comments/managers.py
+++ b/comments/managers.py
@@ -9,3 +9,9 @@ class CommentQuerySet(models.QuerySet):
def awaiting_vetting(self):
return self.filter(status=STATUS_PENDING)
+
+ def regular_comments(self):
+ return self.filter(is_author_reply=False)
+
+ def author_replies(self):
+ return self.filter(is_author_reply=True)
diff --git a/comments/migrations/0014_auto_20170726_2117.py b/comments/migrations/0014_auto_20170726_2117.py
index 60b9cc655291b4b665050b221526ecd5a23d7380..93abe8af32d17736bc80b3162131d5ca14258454 100644
--- a/comments/migrations/0014_auto_20170726_2117.py
+++ b/comments/migrations/0014_auto_20170726_2117.py
@@ -2,12 +2,11 @@
# Generated by Django 1.10.3 on 2017-07-26 19:17
from __future__ import unicode_literals
+from django.contrib.auth import get_user_model
from django.db import migrations
from guardian.shortcuts import assign_perm
-from ..models import Comment
-
def do_nothing(apps, schema_editor):
return
@@ -18,12 +17,15 @@ 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') -- This doesn't work...
+ Comment = apps.get_model('comments', 'Comment')
+ User = get_user_model()
+
count = 0
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)
+ # Grant Permissions
+ user = User.objects.get(id=comment.submission.editor_in_charge.user.id)
+ assign_perm('comments.can_vet_comments', user, comment)
count += 1
print('\nGranted permission to %i Editor(s)-in-charge to vet related Comments.' % count)
diff --git a/comments/migrations/0015_auto_20170727_1248.py b/comments/migrations/0015_auto_20170727_1248.py
new file mode 100644
index 0000000000000000000000000000000000000000..de0a61ca5a5096e1364b319d57e0af4434a5a8e8
--- /dev/null
+++ b/comments/migrations/0015_auto_20170727_1248.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-07-27 10:48
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('contenttypes', '0002_remove_content_type_name'),
+ ('comments', '0014_auto_20170726_2117'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='comment',
+ name='content_type',
+ field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType'),
+ preserve_default=False,
+ ),
+ migrations.AddField(
+ model_name='comment',
+ name='object_id',
+ field=models.PositiveIntegerField(default=1),
+ preserve_default=False,
+ ),
+ migrations.AlterField(
+ model_name='comment',
+ name='submission',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='comments_old', to='submissions.Submission'),
+ ),
+ ]
diff --git a/comments/migrations/0016_auto_20170728_1901.py b/comments/migrations/0016_auto_20170728_1901.py
new file mode 100644
index 0000000000000000000000000000000000000000..d2e4e4a7236ea66e88104c31723f9511dda1cf04
--- /dev/null
+++ b/comments/migrations/0016_auto_20170728_1901.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-07-28 17:01
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('comments', '0015_auto_20170727_1248'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='comment',
+ name='in_reply_to_comment',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='nested_comments_old', to='comments.Comment'),
+ ),
+ ]
diff --git a/comments/migrations/0017_auto_20170729_0717.py b/comments/migrations/0017_auto_20170729_0717.py
new file mode 100644
index 0000000000000000000000000000000000000000..db86be1347d9f1c75a3c61ef6d07bf5028ae94c9
--- /dev/null
+++ b/comments/migrations/0017_auto_20170729_0717.py
@@ -0,0 +1,126 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-07-29 05:17
+from __future__ import unicode_literals
+
+from django.contrib.auth import get_user_model
+from django.contrib.contenttypes.models import ContentType
+from django.db import migrations
+
+from guardian.shortcuts import assign_perm
+
+
+def update_all_contenttypes(**kwargs):
+ from django.apps import apps
+ from django.contrib.contenttypes.management import update_contenttypes
+
+ for app_config in apps.get_app_configs():
+ update_contenttypes(app_config, **kwargs)
+
+
+def create_all_permissions(**kwargs):
+ from django.contrib.auth.management import create_permissions
+ from django.apps import apps
+
+ for app_config in apps.get_app_configs():
+ create_permissions(app_config, **kwargs)
+
+
+def forward():
+ update_all_contenttypes()
+ create_all_permissions()
+
+
+def migrate_comments_from_generic_relations(apps, schema_editor):
+ """
+ Migrate all GenericRelations a Comment has to the oldschool ForeignKey relations.
+ """
+ return
+ Comment = apps.get_model('comments', 'Comment')
+ Report = apps.get_model('submissions', 'Report')
+ Submission = apps.get_model('submissions', 'Submission')
+ Commentary = apps.get_model('commentaries', 'Commentary')
+ ThesisLink = apps.get_model('theses', 'ThesisLink')
+
+ all_comments = Comment.objects.all()
+ for comment in all_comments:
+ _object = comment.content_object
+ if isinstance(_object, Comment):
+ comment.in_reply_to_comment = _object
+
+ # Nested Comments have more relations
+ if isinstance(_object.content_object, ThesisLink):
+ comment.thesislink = _object.content_object
+ elif isinstance(_object.content_object, Submission):
+ comment.submission = _object.content_object
+ elif isinstance(_object.content_object, Commentary):
+ comment.commentary = _object.content_object
+ elif isinstance(_object, Report):
+ comment.in_reply_to_report = _object
+ comment.submission = _object.submission
+ elif isinstance(_object, ThesisLink):
+ comment.thesislink = _object
+ elif isinstance(_object, Submission):
+ comment.submission = _object
+ elif isinstance(_object, Commentary):
+ comment.commentary = _object
+ else:
+ raise AttributeError('Comment has no relation to another valid object.')
+ comment.save()
+ print('\nMigrated %i comments back to oldschool ForeignKey relations.' % len(all_comments))
+
+
+def migrate_comments_to_generic_relations(apps, schema_editor):
+ """
+ Migrate all foreignkey relations a Comment has to the new GenericRelation.
+ """
+ forward()
+ Comment = apps.get_model('comments', 'Comment')
+ User = get_user_model()
+
+ all_comments = Comment.objects.all()
+ for comment in all_comments:
+ if comment.in_reply_to_comment:
+ _object = comment.in_reply_to_comment
+ _object_id = comment.in_reply_to_comment.id
+ _object_type = ContentType.objects.get(app_label="comments", model="comment").id
+ elif comment.in_reply_to_report:
+ _object = comment.in_reply_to_report
+ _object_id = comment.in_reply_to_report.id
+ _object_type = ContentType.objects.get(app_label="submissions", model="report").id
+ elif comment.thesislink:
+ _object = comment.thesislink
+ _object_id = comment.thesislink.id
+ _object_type = ContentType.objects.get(app_label="theses", model="thesislink").id
+ elif comment.submission:
+ _object = comment.submission
+ _object_id = comment.submission.id
+ _object_type = ContentType.objects.get(app_label="submissions", model="submission").id
+ elif comment.commentary:
+ _object = comment.commentary
+ _object_id = comment.commentary.id
+ _object_type = ContentType.objects.get(app_label="commentaries", model="commentary").id
+ else:
+ print('\nNo valid relation for Comment: ', comment.id,)
+ comment.content_object = _object
+ comment.content_type_id = _object_type
+ comment.object_id = _object_id
+ comment.save()
+
+ # Grant Permissions
+ if comment.submission:
+ user = User.objects.get(id=comment.submission.editor_in_charge.user.id)
+ assign_perm('comments.can_vet_comments', user, comment)
+
+ print('\nMigrated %i comments to GenericRelations.' % len(all_comments))
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('comments', '0016_auto_20170728_1901'),
+ ]
+
+ operations = [
+ migrations.RunPython(migrate_comments_to_generic_relations,
+ migrate_comments_from_generic_relations),
+ ]
diff --git a/comments/migrations/0018_auto_20170729_1617.py b/comments/migrations/0018_auto_20170729_1617.py
new file mode 100644
index 0000000000000000000000000000000000000000..c2d3cfed9b3b2ef1f12c2e3431ec846795050927
--- /dev/null
+++ b/comments/migrations/0018_auto_20170729_1617.py
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-07-29 14:17
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('comments', '0017_auto_20170729_0717'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='comment',
+ name='author',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='comments', to='scipost.Contributor'),
+ ),
+ migrations.AlterField(
+ model_name='comment',
+ name='commentary',
+ field=models.ForeignKey(blank=True, help_text='Warning: This field is out of service and will be removed in the future.', null=True, on_delete=django.db.models.deletion.CASCADE, to='commentaries.Commentary'),
+ ),
+ migrations.AlterField(
+ model_name='comment',
+ name='content_type',
+ field=models.ForeignKey(help_text='Warning: Rather use/edit `content_object` instead or be 100% sure you know what you are doing!', on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType'),
+ ),
+ migrations.AlterField(
+ model_name='comment',
+ name='in_reply_to_comment',
+ field=models.ForeignKey(blank=True, help_text='Warning: This field is out of service and will be removed in the future.', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='nested_comments_old', to='comments.Comment'),
+ ),
+ migrations.AlterField(
+ model_name='comment',
+ name='in_reply_to_report',
+ field=models.ForeignKey(blank=True, help_text='Warning: This field is out of service and will be removed in the future.', null=True, on_delete=django.db.models.deletion.CASCADE, to='submissions.Report'),
+ ),
+ migrations.AlterField(
+ model_name='comment',
+ name='object_id',
+ field=models.PositiveIntegerField(help_text='Warning: Rather use/edit `content_object` instead or be 100% sure you know what you are doing!'),
+ ),
+ migrations.AlterField(
+ model_name='comment',
+ name='submission',
+ field=models.ForeignKey(blank=True, help_text='Warning: This field is out of service and will be removed in the future.', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='comments_old', to='submissions.Submission'),
+ ),
+ migrations.AlterField(
+ model_name='comment',
+ name='thesislink',
+ field=models.ForeignKey(blank=True, help_text='Warning: This field is out of service and will be removed in the future.', null=True, on_delete=django.db.models.deletion.CASCADE, to='theses.ThesisLink'),
+ ),
+ ]
diff --git a/comments/models.py b/comments/models.py
index c1c25c9a1e3338297b74c70ecf6e3de5f1cc13d7..82ae4cf7bb8e43c962f9fdf99fd3ead00923e41d 100644
--- a/comments/models.py
+++ b/comments/models.py
@@ -1,6 +1,11 @@
+from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelation
+from django.contrib.contenttypes.models import ContentType
from django.db import models
from django.shortcuts import get_object_or_404
from django.utils import timezone
+from django.utils.functional import cached_property
+
+from guardian.shortcuts import assign_perm
from scipost.behaviors import TimeStampedModel
from scipost.models import Contributor
@@ -10,6 +15,10 @@ from .constants import COMMENT_STATUS, STATUS_PENDING
from .managers import CommentQuerySet
+WARNING_TEXT = 'Warning: Rather use/edit `content_object` instead or be 100% sure you know what you are doing!'
+US_NOTICE = 'Warning: This field is out of service and will be removed in the future.'
+
+
class Comment(TimeStampedModel):
""" A Comment is an unsollicited note, submitted by a Contributor,
on a particular publication or in reply to an earlier Comment. """
@@ -20,20 +29,36 @@ class Comment(TimeStampedModel):
file_attachment = models.FileField(upload_to='uploads/comments/%Y/%m/%d/', blank=True,
validators=[validate_file_extension, validate_max_file_size]
)
- # a Comment is either for a Commentary or Submission or a ThesisLink.
+
+ # A Comment is always related to another model
+ # This construction implicitly has property: `on_delete=models.CASCADE`
+ content_type = models.ForeignKey(ContentType, help_text=WARNING_TEXT)
+ object_id = models.PositiveIntegerField(help_text=WARNING_TEXT)
+ content_object = GenericForeignKey()
+
+ nested_comments = GenericRelation('comments.Comment', related_query_name='comments')
+
+ # -- U/S
+ # These fields will be removed in the future.
+ # They still exists only to prevent possible data loss.
commentary = models.ForeignKey('commentaries.Commentary', blank=True, null=True,
- on_delete=models.CASCADE)
+ on_delete=models.CASCADE, help_text=US_NOTICE)
submission = models.ForeignKey('submissions.Submission', blank=True, null=True,
- on_delete=models.CASCADE, related_name='comments')
+ on_delete=models.CASCADE, related_name='comments_old',
+ help_text=US_NOTICE)
thesislink = models.ForeignKey('theses.ThesisLink', blank=True, null=True,
- on_delete=models.CASCADE)
- is_author_reply = models.BooleanField(default=False)
+ on_delete=models.CASCADE, help_text=US_NOTICE)
in_reply_to_comment = models.ForeignKey('self', blank=True, null=True,
- related_name="nested_comments",
- on_delete=models.CASCADE)
+ related_name="nested_comments_old",
+ on_delete=models.CASCADE, help_text=US_NOTICE)
in_reply_to_report = models.ForeignKey('submissions.Report', blank=True, null=True,
- on_delete=models.CASCADE)
- author = models.ForeignKey('scipost.Contributor', on_delete=models.CASCADE)
+ on_delete=models.CASCADE, help_text=US_NOTICE)
+ # -- End U/S
+
+ # Author info
+ is_author_reply = models.BooleanField(default=False)
+ author = models.ForeignKey('scipost.Contributor', on_delete=models.CASCADE,
+ related_name='comments')
anonymous = models.BooleanField(default=False, verbose_name='Publish anonymously')
# Categories:
@@ -72,6 +97,49 @@ class Comment(TimeStampedModel):
return ('by ' + self.author.user.first_name + ' ' + self.author.user.last_name +
' on ' + self.date_submitted.strftime('%Y-%m-%d') + ', ' + self.comment_text[:30])
+ @property
+ def title(self):
+ """
+ This property is (mainly) used to let Comments get the title of the Submission without
+ annoying logic.
+ """
+ try:
+ return self.content_object.title
+ except:
+ return self.content_type
+
+ @cached_property
+ def core_content_object(self):
+ # Import here due to circular import errors
+ from commentaries.models import Commentary
+ from submissions.models import Submission, Report
+ from theses.models import ThesisLink
+
+ to_object = self.content_object
+ while True:
+ if (isinstance(to_object, Submission) or isinstance(to_object, Commentary) or
+ isinstance(to_object, ThesisLink)):
+ return to_object
+ elif isinstance(to_object, Report):
+ return to_object.submission
+ elif isinstance(to_object, Comment):
+ # Nested Comment.
+ to_object = to_object.content_object
+ else:
+ raise Exception
+
+ def get_absolute_url(self):
+ return self.content_object.get_absolute_url().split('#')[0] + '#comment_id' + str(self.id)
+
+ def grant_permissions(self):
+ # Import here due to circular import errors
+ from submissions.models import Submission
+
+ to_object = self.core_content_object
+ if isinstance(to_object, Submission):
+ # Add permissions for EIC only, the Vetting-group already has it!
+ assign_perm('comments.can_vet_comments', to_object.editor_in_charge.user, self)
+
def get_author(self):
'''Get author, if and only if comment is not anonymous!!!'''
if not self.anonymous:
diff --git a/comments/templates/comments/_comment_card_content.html b/comments/templates/comments/_comment_card_content.html
index fba6a0aee5a47323a4c8a44090b04290a72b5f62..c6788a79a355818dc3e31f711bdda0027efcdeaf 100644
--- a/comments/templates/comments/_comment_card_content.html
+++ b/comments/templates/comments/_comment_card_content.html
@@ -1,31 +1,20 @@
<div class="card-block card-comment">
{% block card_block_header %}{% endblock %}
<p class="card-text">
- <span class="text-blue">
- <a href="{% if comment.get_author %}{% url 'scipost:contributor_info' comment.get_author.id %}{% else %}javascript:;{% endif %}">{{comment.get_author_str}}</a>:
- </span>
+ <a href="{{comment.author.get_absolute_url}}">{{comment.author.user.first_name}} {{comment.author.user.last_name}}</a>:
- {% if comment.submission %}
- <a href="{% url 'submissions:submission' comment.submission.arxiv_identifier_w_vn_nr %}#comment_id{{comment.id}}">
- "{{comment.comment_text|slice:'30'}}{% if comment.comment_text|length > 30 %}...{% endif %}"
- </a>
- </p><p class="card-text pl-md-3">
- in submission on <a href="{% url 'submissions:submission' comment.submission.arxiv_identifier_w_vn_nr %}" class="pubtitleli">{{comment.submission.title}}</a>
- <span class="text-muted">by {{comment.submission.author_list}}</span>
- {% elif comment.commentary %}
- <a href="{% url 'commentaries:commentary' comment.commentary.arxiv_or_DOI_string %}#comment_id{{comment.id}}">
- "{{comment.comment_text|slice:'30'}}{% if comment.comment_text|length > 30 %}...{% endif %}"
- </a>
- </p><p class="card-text pl-md-3">
- in commentary on <a href="{% url 'commentaries:commentary' comment.commentary.arxiv_or_DOI_string %}" class="pubtitleli">{{comment.commentary.pub_title}}</a>
- <span class="text-muted">by {{comment.commentary.author_list}}</span>
- {% elif comment.thesislink %}
- <a href="{% url 'theses:thesis' comment.thesislink.id %}#comment_id{{comment.id}}">
- "{{comment.comment_text|slice:'30'}}{% if comment.comment_text|length > 30 %}...{% endif %}"
- </a>
- </p><p class="card-text pl-md-3">
- in thesislink on <a href="{% url 'theses:thesis' comment.thesislink.id %}" class="pubtitleli">{{comment.thesislink.title}}</a>
- <span class="text-muted">by {{ comment.thesislink.author }}</span>
+ <a href="{{comment.get_absolute_url}">
+ "{{comment.comment_text|slice:'30'}}{% if comment.comment_text|length > 30 %}...{% endif %}"
+ </a>
+ </p><p class="card-text pl-md-3">
+ in {{comment.content_type|capfirst}} on <a href="{{comment.content_object.get_absolute_url}}" class="pubtitleli">{{comment.title}}</a>
+
+ {% if comment.content_object.author_list %}
+ {% comment %}
+ Using 'by xxx' on non-submission comments here would be ambigious. Does the `by xxx` apply to the
+ other object (eg. Report), or the Submission, the Comment, etc?
+ {% endcomment %}
+ <span class="text-muted">by {{comment.content_object.author_list}}</span>
{% endif %}
</p>
</div>
diff --git a/comments/templates/comments/_comment_card_extended_for_author.html b/comments/templates/comments/_comment_card_extended_for_author.html
new file mode 100644
index 0000000000000000000000000000000000000000..aaac79e90846156ed8c28b7b195aad7bd4921aef
--- /dev/null
+++ b/comments/templates/comments/_comment_card_extended_for_author.html
@@ -0,0 +1,16 @@
+<div class="card-block card-comment">
+ <div class="mb-4 mt-2">
+ <div class="d-inline-block mr-1">Nr {{comment.id}}</div>
+ {% include 'comments/_comment_voting_summary.html' with comment=comment class='small' %}
+ </div>
+
+ <p>"{{comment.comment_text|linebreaksbr}}"</p>
+ <p class="card-text">by <a href="{{comment.author.get_absolute_url}}">{{comment.author.user.first_name}} {{comment.author.user.last_name}}</a> in {{comment.content_type|capfirst}} on <a href="{{comment.content_object.get_absolute_url}}" class="pubtitleli">{{comment.title}}</a> {% if comment.content_object.author_list %} <span class="text-muted">by {{comment.content_object.author_list}}</span>{% endif %}</p>
+
+ {% comment %}
+ Using 'by xxx' on non-submission comments here would be ambigious. Does the `by xxx` apply to the
+ other object (eg. Report), or the Submission, the Comment, etc?
+ {% endcomment %}
+ <p class="card-text text-muted">Comment submitted {{comment.date_submitted}}</p>
+ <p class="card-text">Status: <span class="{% if comment.status == 1 %} text-success{% elif comment.status == 0 %} text-danger{% endif %}">{{comment.get_status_display}}</span></p>
+</div>
diff --git a/comments/templates/comments/_comment_categories.html b/comments/templates/comments/_comment_categories.html
index fec5707adee9e21640e36ce5c4d8208df2ee2893..e848c6632b726cbb6c94cc1db013cefb6ac53f19 100644
--- a/comments/templates/comments/_comment_categories.html
+++ b/comments/templates/comments/_comment_categories.html
@@ -1,30 +1,34 @@
-<div class="btn-group category-group {{class}}">
- <label class="btn btn-secondary name">Category:</label>
- {% if comment.is_rem %}
- <label class="btn btn-secondary"><span class="inner">remark</spin></label>
- {% endif %}
- {% if comment.is_que %}
- <label class="btn btn-secondary"><span class="inner">question</spin></label>
- {% endif %}
- {% if comment.is_ans %}
- <label class="btn btn-secondary"><span class="inner">answer to question</spin></label>
- {% endif %}
- {% if comment.is_obj %}
- <label class="btn btn-secondary"><span class="inner">objection</spin></label>
- {% endif %}
- {% if comment.is_rep %}
- <label class="btn btn-secondary"><span class="inner">reply to objection</spin></label>
- {% endif %}
- {% if comment.is_cor %}
- <label class="btn btn-secondary"><span class="inner">correction</spin></label>
- {% endif %}
- {% if comment.is_val %}
- <label class="btn btn-secondary"><span class="inner">validation or rederivation</spin></label>
- {% endif %}
- {% if comment.is_lit %}
- <label class="btn btn-secondary"><span class="inner">pointer to related literature</spin></label>
- {% endif %}
- {% if comment.is_sug %}
- <label class="btn btn-secondary"><span class="inner">suggestion for further work</spin></label>
- {% endif %}
-</div>
+{% load comment_extras %}
+
+{% if comment|has_category %}
+ <div class="btn-group category-group mr-2">
+ <label class="btn btn-secondary name">Category:</label>
+ {% if comment.is_rem %}
+ <label class="btn btn-secondary"><span class="inner">remark</spin></label>
+ {% endif %}
+ {% if comment.is_que %}
+ <label class="btn btn-secondary"><span class="inner">question</spin></label>
+ {% endif %}
+ {% if comment.is_ans %}
+ <label class="btn btn-secondary"><span class="inner">answer to question</spin></label>
+ {% endif %}
+ {% if comment.is_obj %}
+ <label class="btn btn-secondary"><span class="inner">objection</spin></label>
+ {% endif %}
+ {% if comment.is_rep %}
+ <label class="btn btn-secondary"><span class="inner">reply to objection</spin></label>
+ {% endif %}
+ {% if comment.is_cor %}
+ <label class="btn btn-secondary"><span class="inner">correction</spin></label>
+ {% endif %}
+ {% if comment.is_val %}
+ <label class="btn btn-secondary"><span class="inner">validation or rederivation</spin></label>
+ {% endif %}
+ {% if comment.is_lit %}
+ <label class="btn btn-secondary"><span class="inner">pointer to related literature</spin></label>
+ {% endif %}
+ {% if comment.is_sug %}
+ <label class="btn btn-secondary"><span class="inner">suggestion for further work</spin></label>
+ {% endif %}
+ </div>
+{% endif %}
diff --git a/comments/templates/comments/_comment_identifier.html b/comments/templates/comments/_comment_identifier.html
index 3247be4b6f071feae71a2f1279ded6e0973f9f74..5e668b933aefc737db21a22149daf829a8594fce 100644
--- a/comments/templates/comments/_comment_identifier.html
+++ b/comments/templates/comments/_comment_identifier.html
@@ -1,31 +1,23 @@
+{% load comment_extras %}
+
<div class="commentid" id="comment_id{{comment.id}}">
<h3>
{% if comment.is_author_reply %}Author{% endif %}
- {% block comment_author %}
- {% if not comment.anonymous %}
- <a href="{% url 'scipost:contributor_info' comment.get_author.id %}">{{comment.get_author_str}}</a>
- {% else %}
- Anonymous
- {% endif %}
- {% endblock comment_author %}
+ <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>
- {% if comment.in_reply_to_comment or comment.in_reply_to_report %}
- <h4>
- {% if comment.in_reply_to_comment %}
- (in reply to <a href="#comment_id{{comment.in_reply_to_comment.id}}">{{comment.in_reply_to_comment.comment.get_author_str}}</a> on {{comment.in_reply_to_comment.date_submitted|date:'Y-m-d'}})
- {% elif comment.in_reply_to_report %}
- (in reply to <a href="#report_{{comment.in_reply_to_report.report_nr}}">
- {% if not comment.in_reply_to_report.anonymous %}
- {{comment.in_reply_to_report.get_author_str}}
- {% else %}
- Report {{comment.in_reply_to_report.id}}
- {% endif %}
+ {% if comment|is_reply_to_comment %}
+ (in reply to <a href="{{comment.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'}})
+ {% elif comment|is_reply_to_report %}
+ (in reply to <a href="{{comment.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> on {{comment.in_reply_to_report.date_submitted|date:'Y-m-d'}})
- {% endif %}
- </h4>
+ </a> on {{comment.content_object.date_submitted|date:'Y-m-d'}})
{% endif %}
</div>
diff --git a/comments/templates/comments/_comment_identifier_vetting.html b/comments/templates/comments/_comment_identifier_vetting.html
deleted file mode 100644
index edf903c7eac54853e71e69c30c5640d01262bf42..0000000000000000000000000000000000000000
--- a/comments/templates/comments/_comment_identifier_vetting.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% extends 'comments/_comment_identifier.html' %}
-
-{% comment %}
-
- Be careful using this template!!!
- It overwrites the anonymity of the writer!
-
-{% endcomment %}
-
-{% block comment_author %}
- <a href="{% url 'scipost:contributor_info' comment.author.id %}">{{comment.author.user.first_name}} {{comment.author.user.last_name}}</a>
-{% endblock comment_author %}
diff --git a/comments/templates/comments/_comment_tex_template.html b/comments/templates/comments/_comment_tex_template.html
index b6540e82c6d45520961cb04feacc921b65b4e5d0..cb39aa0d3c78f50d5fe9f2d75f618abadc9ce8a5 100644
--- a/comments/templates/comments/_comment_tex_template.html
+++ b/comments/templates/comments/_comment_tex_template.html
@@ -4,8 +4,8 @@ Received {{comment.date_submitted|date:'d-m-Y'}}\ \\
{% endspaceless %}
{% for subcomment in comment.nested_comments.vetted %}
- \addcontentsline{toc}{subsection}{\protect\numberline{}{% if subcomment.is_author_reply %}Author Reply{% else %}Comment{% endif %} {{forloop.counter}} by {% if subcomment.anonymous %}anonymous{% else %}{{subcomment.author.user.first_name}} {{subcomment.author.user.last_name}}{% endif %} }
+ \addcontentsline{toc}{subsection}{\protect\numberline{}{% if subcomment.is_author_reply %}Author Reply{% else %}Comment{% endif %} {{forloop.counter}} by {{subcomment.author.user.first_name}} {{subcomment.author.user.last_name}} }
- \subsection*{ {% if subcomment.is_author_reply %}Author Reply{% else %}Comment{% endif %} {{forloop.parentloop.counter}}.{{forloop.counter}} by {% if subcomment.anonymous %}anonymous{% else %}{{subcomment.author.user.first_name}} {{subcomment.author.user.last_name}}{% endif %} }
+ \subsection*{ {% if subcomment.is_author_reply %}Author Reply{% else %}Comment{% endif %} {{forloop.parentloop.counter}}.{{forloop.counter}} by {{subcomment.author.user.first_name}} {{subcomment.author.user.last_name}} }
{% include 'comments/_comment_tex_template.html' with comment=subcomment %}
{% endfor %}
diff --git a/comments/templates/comments/_comment_voting_form.html b/comments/templates/comments/_comment_voting_form.html
index 1563284d7cfd90111e4864b04809f642d3d05b47..b1b8fe06b242a5879ea229b93baeff599bac3bd7 100644
--- a/comments/templates/comments/_comment_voting_form.html
+++ b/comments/templates/comments/_comment_voting_form.html
@@ -1,3 +1,4 @@
+
{% if user.is_authenticated and perms.scipost.can_express_opinion_on_comments %}
{% if user.contributor != comment.author %}
<div class="btn-group voting-group {{class}}">
diff --git a/comments/templates/comments/_single_comment.html b/comments/templates/comments/_single_comment.html
index 1eaaf85a016bf09f61c8b349bd7339cbae35e843..0759c42ee017a67d2bbf6d345f140b5baf7b29aa 100644
--- a/comments/templates/comments/_single_comment.html
+++ b/comments/templates/comments/_single_comment.html
@@ -2,53 +2,40 @@
{% load filename %}
{% load file_extentions %}
-<div class="row">
- <div class="col-12">
- <div class="comment" id="comment_id{{comment.id}}">
-
- <div class="row">
- <div class="col-12">
- {% include 'comments/_comment_identifier.html' with comment=comment %}
-
- {% include 'comments/_comment_categories.html' with comment=comment class='mr-2' %}
-
- {% include 'comments/_comment_voting_form.html' with comment=comment perms=perms user=user %}
- </div>
- </div>
-
-
- <div class="row">
- <div class="col-12">
- <p>
- {{ comment.comment_text|linebreaks }}
-
- {% if comment.file_attachment %}
- <h3>Attachment:</h3>
- <p>
- <a target="_blank" href="{{ comment.file_attachment.url }}">
- {% if comment.file_attachment|is_image %}
- <img class="attachment attachment-comment" src="{{ comment.file_attachment.url }}">
- {% else %}
- {{ comment.file_attachment|filename }}<br><small>{{ comment.file_attachment.size|filesizeformat }}</small>
- {% endif %}
- </a>
- </p>
- {% endif %}
- </p>
- {% if user|is_in_group:'Editorial College' or user|is_in_group:'Editorial Administrators' %}
- {% if comment.remarks_for_editors %}
- <h3>Remarks for editors:</h3>
- <p>{{ comment.remarks_for_editors|linebreaks }}</p>
- {% endif %}
- {% endif %}
- </div>
- </div>
+<div class="comment">
+
+ {% include 'comments/_comment_identifier.html' with comment=comment %}
+
+ {% include 'comments/_comment_categories.html' with comment=comment %}
- {% for reply in comment.nested_comments.vetted %}
- {% include 'comments/_single_comment.html' with comment=reply perms=perms user=user %}
- {% endfor %}
+ {% include 'comments/_comment_voting_form.html' with comment=comment perms=perms user=user %}
- {% block comment_footer %}{% endblock %}
- </div>
- </div>
+ <p class="my-3 pb-2">
+ {{ comment.comment_text|linebreaksbr }}
+
+ {% if comment.file_attachment %}
+ <h3>Attachment:</h3>
+ <p>
+ <a target="_blank" href="{{ comment.file_attachment.url }}">
+ {% if comment.file_attachment|is_image %}
+ <img class="attachment attachment-comment" src="{{ comment.file_attachment.url }}">
+ {% else %}
+ {{ comment.file_attachment|filename }}<br><small>{{ comment.file_attachment.size|filesizeformat }}</small>
+ {% endif %}
+ </a>
+ </p>
+ {% endif %}
+ </p>
+ {% if user|is_in_group:'Editorial College' or user|is_in_group:'Editorial Administrators' %}
+ {% if comment.remarks_for_editors %}
+ <h3>Remarks for editors:</h3>
+ <p>{{ comment.remarks_for_editors|linebreaks }}</p>
+ {% endif %}
+ {% endif %}
+
+ {% for reply in comment.nested_comments.vetted %}
+ {% include 'comments/_single_comment.html' with comment=reply perms=perms user=user %}
+ {% endfor %}
+
+ {% block comment_footer %}{% endblock %}
</div>
diff --git a/comments/templates/comments/_single_comment_with_link.html b/comments/templates/comments/_single_comment_with_link.html
index 9952e67b1dd0a805beb635e7a939784f101ddc5b..552db102a5a95357cd548a96b5b4cb2d3419bacb 100644
--- a/comments/templates/comments/_single_comment_with_link.html
+++ b/comments/templates/comments/_single_comment_with_link.html
@@ -3,6 +3,6 @@
{% block comment_footer %}
{% if user.is_authenticated and perms.scipost.can_submit_comments %}
<hr class="small">
- <h3><a href="{% url 'comments:reply_to_comment' comment_id=comment.id %}">Reply to this comment</a></h3>
+ <h3 class="mb-3"><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/_vet_comment_form.html b/comments/templates/comments/_vet_comment_form.html
index dd01802345af1267abc90e834d7e65bbab50a9a9..204b12d7017b92b141c0e0aeb8c04271136f0e6b 100644
--- a/comments/templates/comments/_vet_comment_form.html
+++ b/comments/templates/comments/_vet_comment_form.html
@@ -1,24 +1,12 @@
{% load bootstrap %}
{% load filename %}
{% load file_extentions %}
+{% load comment_extras %}
<div class="card card-vetting">
<div class="card-header">
-
- {% if comment.commentary %}
- <h2>From Commentary (<a href="{{comment.commentary.get_absolute_url}}">link</a>)</h2>
- {% include 'commentaries/_commentary_summary.html' with commentary=comment.commentary %}
- {% endif %}
-
- {% if comment.submission %}
- <h2>From Submission (<a href="{{comment.submission.get_absolute_url}}">link</a>)</h2>
- {% include 'submissions/_submission_summary_short.html' with submission=comment.submission %}
- {% endif %}
-
- {% if comment.thesislink %}
- <h2>From Thesis Link (<a href="{{comment.thesislink.get_absolute_url}}">link</a>)</h2>
- {% include 'theses/_thesislink_information.html' with thesislink=comment.thesislink %}
- {% endif %}
+ <h2>From {{comment.core_content_object|get_core_content_type|capfirst}} (<a href="{{comment.get_absolute_url}}" target="_blank">link</a>)</h2>
+ {% get_summary_template comment.core_content_object %}
</div>
<div class="card-block">
@@ -26,7 +14,7 @@
<div class="row">
<div class="col-md-6">
- {% include 'comments/_comment_identifier_vetting.html' with comment=comment %}
+ {% include 'comments/_comment_identifier.html' with comment=comment %}
<hr class="small">
<h3>Comment text:</h3>
diff --git a/comments/templates/comments/reply_to_comment.html b/comments/templates/comments/reply_to_comment.html
index 3937e5d0051a557def52eb7728998e2b5f0ccbf3..26a545ddbe4c0b0c1b984b9dc77a18166e9999ba 100644
--- a/comments/templates/comments/reply_to_comment.html
+++ b/comments/templates/comments/reply_to_comment.html
@@ -1,5 +1,7 @@
{% extends 'scipost/base.html' %}
+{% load comment_extras %}
+
{% block pagetitle %}: reply to comment{% endblock pagetitle %}
{% block content %}
@@ -13,25 +15,8 @@
<div class="row">
<div class="col-12">
- {% if comment.commentary %}
- <h2>The Commentary concerned:</h2>
- {% include 'commentaries/_commentary_summary.html' with commentary=comment.commentary %}
-
- <h3 class="mt-3">Abstract:</h3>
- <p>{{ comment.commentary.pub_abstract }}</p>
- {% endif %}
-
- {% if comment.submission %}
- <h2>The Submission concerned:</h2>
-
- {% include 'submissions/_submission_summary.html' with submission=comment.submission %}
-
- {% endif %}
-
- {% if comment.thesislink %}
- <h2>The Thesis concerned:</h2>
- {% include "theses/_thesislink_information.html" with thesislink=comment.thesislink %}
- {% endif %}
+ <h2>The {{comment.core_content_object|get_core_content_type|capfirst}} concerned:</h2>
+ {% get_summary_template comment.core_content_object %}
</div>
</div>
@@ -49,7 +34,7 @@
{% include 'comments/_comment_voting_summary.html' with comment=comment %}
- <p>{{ comment.comment_text|linebreaks }}</p>
+ <p>{{ comment.comment_text|linebreaksbr }}</p>
</div>
</div>
</div>
diff --git a/comments/templates/comments/submit_comment_form.html b/comments/templates/comments/submit_comment_form.html
deleted file mode 100644
index 8251b3daf4faa657f5d34a537139069dbc4c61c1..0000000000000000000000000000000000000000
--- a/comments/templates/comments/submit_comment_form.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% load bootstrap %}
-
-{# This template should eventually be used to create a single template for all comment forms ! #}
-
-
-
-{% for field in form %}
- {% include 'tags/bootstrap/field.html' with field=field %}
-{% endfor %}
diff --git a/theses/templatetags/__init__.py b/comments/templatetags/__init__.py
similarity index 100%
rename from theses/templatetags/__init__.py
rename to comments/templatetags/__init__.py
diff --git a/comments/templatetags/comment_extras.py b/comments/templatetags/comment_extras.py
new file mode 100644
index 0000000000000000000000000000000000000000..60d6707af00baeb81ce772d30f6437a83e2f5cf2
--- /dev/null
+++ b/comments/templatetags/comment_extras.py
@@ -0,0 +1,92 @@
+from django import template
+from django.utils.safestring import mark_safe
+
+from ..models import Comment
+
+from commentaries.models import Commentary
+from submissions.models import Submission, Report
+from theses.models import ThesisLink
+
+register = template.Library()
+
+
+class CommentTemplateNode(template.Node):
+ """
+ This template node accepts an object being a Submission, Commentary or ThesisLink
+ and includes its summary page.
+ """
+ def __init__(self, content_object):
+ self.content_object = content_object
+
+ def render(self, context):
+ content_object = self.content_object.resolve(context)
+ if isinstance(content_object, Submission):
+ t = context.template.engine.get_template('submissions/_submission_summary_short.html')
+ return t.render(template.Context({'submission': content_object}))
+ elif isinstance(content_object, Commentary):
+ t = context.template.engine.get_template('commentaries/_commentary_summary.html')
+ return t.render(template.Context({'commentary': content_object}))
+ elif isinstance(content_object, ThesisLink):
+ t = context.template.engine.get_template('theses/_thesislink_information.html')
+ return t.render(template.Context({'thesislink': content_object}))
+ else:
+ raise template.TemplateSyntaxError(
+ "The instance type given as an argument is not supported.")
+
+
+@register.filter
+def get_core_content_type(content_object):
+ if isinstance(content_object, Submission):
+ return 'submission'
+ elif isinstance(content_object, Commentary):
+ return 'commentary'
+ elif isinstance(content_object, ThesisLink):
+ return 'thesislink'
+
+
+@register.tag
+def get_summary_template(parser, token):
+ """
+ This tag includes the summary template of the object, using `CommentTemplateNode`
+ to determine the template and its context.
+ """
+ try:
+ tag_name, content_object = token.split_contents()
+ except ValueError:
+ raise template.TemplateSyntaxError(
+ "get_summary_template tag requires exactly two arguments")
+ content_object = template.Variable(content_object)
+ return CommentTemplateNode(content_object)
+
+
+@register.filter
+def is_reply_to_comment(comment):
+ return isinstance(comment.content_object, Comment)
+
+
+@register.filter
+def is_reply_to_report(comment):
+ return isinstance(comment.content_object, Report)
+
+
+@register.filter
+def has_category(comment):
+ if comment.is_cor:
+ return True
+ elif comment.is_rem:
+ return True
+ elif comment.is_que:
+ return True
+ elif comment.is_ans:
+ return True
+ elif comment.is_obj:
+ return True
+ elif comment.is_rep:
+ return True
+ elif comment.is_val:
+ return True
+ elif comment.is_lit:
+ return True
+ elif comment.is_sug:
+ return True
+ return False
diff --git a/comments/test_views.py b/comments/test_views.py
index d80fea2bd5e779336dc0d3ce31a6e77f9ae23a91..c16e256953ec7be3ea87ce46c9e96f16763cb15c 100644
--- a/comments/test_views.py
+++ b/comments/test_views.py
@@ -1,8 +1,7 @@
from django.test import TestCase, RequestFactory, Client
-from django.urls import reverse, reverse_lazy
-from django.contrib.auth.models import Group
+from django.urls import reverse
from django.contrib.messages.storage.fallback import FallbackStorage
-from django.core.exceptions import PermissionDenied
+from django.http import Http404
from scipost.factories import ContributorFactory
from theses.factories import ThesisLinkFactory
@@ -20,6 +19,7 @@ from common.helpers.test import add_groups_and_permissions
class TestNewComment(TestCase):
def setUp(self):
add_groups_and_permissions()
+ ContributorFactory.create_batch(5)
def install_messages_middleware(self, request):
# I don't know what the following three lines do, but they help make a RequestFactory
@@ -33,7 +33,7 @@ class TestNewComment(TestCase):
contributor = ContributorFactory()
thesislink = ThesisLinkFactory()
- valid_comment_data = model_form_data(CommentFactory.build(), CommentForm)
+ valid_comment_data = model_form_data(CommentFactory, CommentForm)
target = reverse('comments:new_comment', kwargs={'object_id': thesislink.id, 'type_of_object': 'thesislink'})
comment_count = Comment.objects.filter(author=contributor).count()
@@ -56,7 +56,7 @@ class TestNewComment(TestCase):
submission = EICassignedSubmissionFactory()
submission.open_for_commenting = True
submission.save()
- valid_comment_data = model_form_data(CommentFactory.build(), CommentForm)
+ valid_comment_data = model_form_data(CommentFactory, CommentForm)
target = reverse(
'comments:new_comment',
kwargs={'object_id': submission.id, 'type_of_object': 'submission'},
@@ -80,13 +80,12 @@ class TestNewComment(TestCase):
)
self.assertRedirects(response, expected_redirect_link)
-
def test_submitting_comment_on_commentary_creates_comment_and_redirects(self):
""" Valid Comment gets saved """
contributor = ContributorFactory()
commentary = UnpublishedVettedCommentaryFactory()
- valid_comment_data = model_form_data(CommentFactory.build(), CommentForm)
+ valid_comment_data = model_form_data(CommentFactory, CommentForm)
target = reverse('comments:new_comment', kwargs={'object_id': commentary.id, 'type_of_object': 'commentary'})
comment_count = Comment.objects.filter(author=contributor).count()
@@ -97,7 +96,7 @@ class TestNewComment(TestCase):
request.user = contributor.user
response = new_comment(request, object_id=commentary.id, type_of_object='commentary')
- comment_count = commentary.comment_set.count()
+ comment_count = commentary.comments.count()
self.assertEqual(comment_count, 1)
response.client = Client()
@@ -105,13 +104,12 @@ class TestNewComment(TestCase):
'commentaries:commentary', kwargs={'arxiv_or_DOI_string': commentary.arxiv_or_DOI_string})
self.assertRedirects(response, expected_redirect_link)
-
def test_submitting_comment_on_submission_that_is_not_open_for_commenting_should_be_impossible(self):
contributor = ContributorFactory()
submission = EICassignedSubmissionFactory()
submission.open_for_commenting = False
submission.save()
- valid_comment_data = model_form_data(CommentFactory.build(), CommentForm)
+ valid_comment_data = model_form_data(CommentFactory, CommentForm)
target = reverse(
'comments:new_comment',
kwargs={'object_id': submission.id, 'type_of_object': 'submission'},
@@ -123,5 +121,5 @@ class TestNewComment(TestCase):
request = RequestFactory().post(target, valid_comment_data)
self.install_messages_middleware(request)
request.user = contributor.user
- with self.assertRaises(PermissionDenied):
- response = new_comment(request, object_id=submission.id, type_of_object='submission')
+ with self.assertRaises(Http404):
+ new_comment(request, object_id=submission.id, type_of_object='submission')
diff --git a/comments/views.py b/comments/views.py
index 4ef6459aec3163f56e85878d84173240c77175bf..fba5791ba8e8a1b212eee8660dc77d77b7f32bb0 100644
--- a/comments/views.py
+++ b/comments/views.py
@@ -3,10 +3,9 @@ from django.shortcuts import get_object_or_404, render, redirect
from django.contrib.auth.decorators import permission_required, login_required
from django.contrib import messages
from django.core.urlresolvers import reverse
-from django.http import HttpResponseRedirect
from django.db import transaction
-from guardian.shortcuts import assign_perm, get_objects_for_user
+from guardian.shortcuts import get_objects_for_user
import strings
from .models import Comment
@@ -26,25 +25,19 @@ def new_comment(request, **kwargs):
object_id = int(kwargs["object_id"])
type_of_object = kwargs["type_of_object"]
- new_comment = form.save(commit=False)
- new_comment.author = request.user.contributor
-
if type_of_object == "thesislink":
_object = get_object_or_404(ThesisLink.objects.open_for_commenting(), id=object_id)
- new_comment.thesislink = _object
- new_comment.save()
elif type_of_object == "submission":
_object = get_object_or_404(Submission.objects.open_for_commenting(), id=object_id)
- new_comment.submission = _object
- new_comment.save()
_object.add_event_for_eic('A new comment has been added.')
-
- # Add permissions for EIC only, the Vetting-group already has it!
- assign_perm('comments.can_vet_comments', _object.editor_in_charge.user, new_comment)
elif type_of_object == "commentary":
_object = get_object_or_404(Commentary.objects.open_for_commenting(), id=object_id)
- new_comment.commentary = _object
- new_comment.save()
+
+ new_comment = form.save(commit=False)
+ new_comment.author = request.user.contributor
+ new_comment.content_object = _object
+ new_comment.save()
+ new_comment.grant_permissions()
messages.success(request, strings.acknowledge_submit_comment)
return redirect(_object.get_absolute_url())
@@ -79,27 +72,23 @@ def vet_submitted_comment(request, comment_id):
CommentUtils.email_comment_vet_accepted_to_author()
# Update `latest_activity` fields
- if comment.commentary:
- comment.commentary.latest_activity = timezone.now()
- comment.commentary.save()
- elif comment.submission:
- comment.submission.latest_activity = timezone.now()
- comment.submission.save()
+ content_object = comment.content_object
+ content_object.latest_activity = timezone.now()
+ content_object.save()
+ if isinstance(content_object, Submission):
# Add events to Submission and send mail to author of the Submission
- comment.submission.add_event_for_eic('A Comment has been accepted.')
- comment.submission.add_event_for_author('A new Comment has been added.')
+ content_object.add_event_for_eic('A Comment has been accepted.')
+ content_object.add_event_for_author('A new Comment has been added.')
if not comment.is_author_reply:
- SubmissionUtils.load({'submission': comment.submission})
+ SubmissionUtils.load({'submission': content_object})
SubmissionUtils.send_author_comment_received_email()
- elif comment.thesislink:
- comment.thesislink.latest_activity = timezone.now()
- comment.thesislink.save()
+
elif form.cleaned_data['action_option'] == '2':
# The comment request is simply rejected
comment.status = int(form.cleaned_data['refusal_reason'])
if comment.status == 0:
- comment.status = -1
+ comment.status = -1 # Why's this here??
comment.save()
# Send emails
@@ -107,14 +96,17 @@ def vet_submitted_comment(request, comment_id):
CommentUtils.email_comment_vet_rejected_to_author(
email_response=form.cleaned_data['email_response_field'])
- if comment.submission:
- comment.submission.add_event_for_eic('A Comment has been rejected.')
+ if isinstance(comment.content_object, Submission):
+ # Add event if commented to Submission
+ comment.content_object.add_event_for_eic('A Comment has been rejected.')
messages.success(request, 'Submitted Comment vetted.')
- if comment.submission and comment.submission.editor_in_charge == request.user.contributor:
- # Redirect a EIC back to the Editorial Page!
- return redirect(reverse('submissions:editorial_page',
- args=(comment.submission.arxiv_identifier_w_vn_nr,)))
+ if isinstance(comment.content_object, Submission):
+ submission = comment.content_object
+ if submission.editor_in_charge == request.user.contributor:
+ # Redirect a EIC back to the Editorial Page!
+ return redirect(reverse('submissions:editorial_page',
+ args=(submission.arxiv_identifier_w_vn_nr,)))
elif request.user.has_perm('scipost.can_vet_comments'):
# Redirect vetters back to check for other unvetted comments!
return redirect(reverse('comments:vet_submitted_comments_list'))
@@ -132,40 +124,25 @@ def reply_to_comment(request, comment_id):
comment = get_object_or_404(Comment, pk=comment_id)
# Verify if this is from an author:
- is_author = False
- if comment.submission and not is_author:
- is_author = comment.submission.authors.filter(id=request.user.contributor.id).exists()
- if comment.commentary and not is_author:
- is_author = comment.commentary.authors.filter(id=request.user.contributor.id).exists()
- if comment.thesislink and not is_author:
- is_author = comment.thesislink.author == request.user.contributor
+ try:
+ # Submission/Commentary
+ is_author = comment.content_object.authors.filter(id=request.user.contributor.id).exists()
+ except AttributeError:
+ # ThesisLink
+ is_author = comment.content_object.author == request.user.contributor
form = CommentForm(request.POST or None, request.FILES or None)
if form.is_valid():
newcomment = form.save(commit=False)
- # Either one of commentary, submission or thesislink will be not Null
- newcomment.commentary = comment.commentary
- newcomment.submission = comment.submission
- newcomment.thesislink = comment.thesislink
+ newcomment.content_object = comment
newcomment.is_author_reply = is_author
- newcomment.in_reply_to_comment = comment
newcomment.author = request.user.contributor
newcomment.save()
+ newcomment.grant_permissions()
messages.success(request, '<h3>Thank you for contributing a Reply</h3>'
'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())
- elif newcomment.thesislink:
- return redirect(newcomment.thesislink.get_absolute_url())
- return redirect(reverse('scipost:index'))
+ return redirect(newcomment.content_object.get_absolute_url())
context = {'comment': comment, 'is_author': is_author, 'form': form}
return render(request, 'comments/reply_to_comment.html', context)
@@ -181,15 +158,11 @@ def reply_to_report(request, report_id):
form = CommentForm(request.POST or None, request.FILES or None)
if form.is_valid():
newcomment = form.save(commit=False)
- newcomment.submission = report.submission
+ newcomment.content_object = report
newcomment.is_author_reply = is_author
- newcomment.in_reply_to_report = report
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)
+ newcomment.grant_permissions()
messages.success(request, '<h3>Thank you for contributing a Reply</h3>'
'It will soon be vetted by an Editor.')
@@ -202,18 +175,6 @@ def reply_to_report(request, report_id):
@permission_required('scipost.can_express_opinion_on_comments', raise_exception=True)
def express_opinion(request, comment_id, opinion):
# A contributor has expressed an opinion on a comment
- contributor = request.user.contributor
comment = get_object_or_404(Comment, pk=comment_id)
- comment.update_opinions(contributor.id, opinion)
- if comment.submission is not None:
- return HttpResponseRedirect('/submission/' + comment.submission.arxiv_identifier_w_vn_nr +
- '/#comment_id' + str(comment.id))
- if comment.commentary is not None:
- return HttpResponseRedirect('/commentary/' + str(comment.commentary.arxiv_or_DOI_string) +
- '/#comment_id' + str(comment.id))
- if comment.thesislink is not None:
- return HttpResponseRedirect('/thesis/' + str(comment.thesislink.id) +
- '/#comment_id' + str(comment.id))
- else:
- # will never call this
- return(render(request, 'scipost/index.html'))
+ comment.update_opinions(request.user.contributor.id, opinion)
+ return redirect(comment.get_absolute_url())
diff --git a/scipost/models.py b/scipost/models.py
index 2c32f440b4a64de2ab4369b647e419cf5cdd0743..b12640ca23c0e4a93349e5f742f586829e52875d 100644
--- a/scipost/models.py
+++ b/scipost/models.py
@@ -8,6 +8,7 @@ from django.contrib.postgres.fields import ArrayField
from django.db import models
from django.template import Template, Context
from django.utils import timezone
+from django.urls import reverse
from django_countries.fields import CountryField
@@ -68,6 +69,9 @@ class Contributor(models.Model):
def __str__(self):
return '%s, %s' % (self.user.last_name, self.user.first_name)
+ def get_absolute_url(self):
+ return reverse('scipost:contributor_info', args=(self.id,))
+
def get_formal_display(self):
return '%s %s %s' % (self.get_title_display(), self.user.first_name, self.user.last_name)
diff --git a/scipost/services.py b/scipost/services.py
index 9e61ccd731882f140a3095e7d0b7dfb786250892..3df2ce70fb903edf7ea290f81830ce69094d566c 100644
--- a/scipost/services.py
+++ b/scipost/services.py
@@ -23,7 +23,7 @@ class DOICaller:
def _format_data(self):
data = self._crossref_data
- pub_title = data['title'][0]
+ title = data['title'][0]
author_list = ['{} {}'.format(author['given'], author['family']) for author in data['author']]
# author_list is given as a comma separated list of names on the relevant models (Commentary, Submission)
author_list = ", ".join(author_list)
@@ -33,7 +33,7 @@ class DOICaller:
pub_date = self._get_pub_date(data)
self.data = {
- 'pub_title': pub_title,
+ 'title': title,
'author_list': author_list,
'journal': journal,
'volume': volume,
@@ -86,7 +86,7 @@ class ArxivCaller:
def _format_data(self):
data = self._arxiv_data
- pub_title = data['title']
+ title = data['title']
author_list = [author['name'] for author in data['authors']]
# author_list is given as a comma separated list of names on the relevant models (Commentary, Submission)
author_list = ", ".join(author_list)
@@ -95,8 +95,7 @@ class ArxivCaller:
pub_date = dateutil.parser.parse(data['published']).date()
self.data = {
- 'pub_title': pub_title,
- 'title': pub_title, # Duplicate for Commentary/Submission cross-compatibility
+ 'title': title,
'author_list': author_list,
'arxiv_link': arxiv_link,
'pub_abstract': abstract,
diff --git a/scipost/templates/scipost/comments_block.html b/scipost/templates/scipost/comments_block.html
index 9b9507f085931320986c9eb93c5ac93131b2260a..14d9eb94e68ba256201b29b32c26563290eac3eb 100644
--- a/scipost/templates/scipost/comments_block.html
+++ b/scipost/templates/scipost/comments_block.html
@@ -4,7 +4,7 @@
<div class="col-12">
<div class="card card-grey">
<div class="card-block">
- <h2 class="card-title">Comments on this publication</h2>
+ <h2 class="card-title">Comments{% if type_of_object %} on this {{type_of_object}}{% endif %}</h2>
<button class="btn btn-secondary" data-toggle="toggle" data-target="#commentslist">Toggle comments view</button>
</div>
</div>
diff --git a/scipost/templates/scipost/personal_page.html b/scipost/templates/scipost/personal_page.html
index 8a1af258f5819f432dc0fd6678e1f8ea552ba984..c5534d31391d943a5dbcc8ab59c0de5c7415e9c9 100644
--- a/scipost/templates/scipost/personal_page.html
+++ b/scipost/templates/scipost/personal_page.html
@@ -58,10 +58,14 @@
<a class="nav-link" data-toggle="tab" href="#theses">Theses</a>
</li>
<li class="nav-item btn btn-secondary">
- <a class="nav-link" data-toggle="tab" href="#comments">Comments</a>
+ {% with request.user.contributor.comments.regular_comments.awaiting_vetting.count as count %}
+ <a class="nav-link" data-toggle="tab" href="#comments">Comments{% if count %} ({{count}} unvetted){% endif %}</a>
+ {% endwith %}
</li>
<li class="nav-item btn btn-secondary">
- <a class="nav-link" data-toggle="tab" href="#author-replies">Author Replies</a>
+ {% with request.user.contributor.comments.author_replies.awaiting_vetting.count as count %}
+ <a class="nav-link" data-toggle="tab" href="#author-replies">Author Replies{% if count %} ({{count}} unvetted){% endif %}</a>
+ {% endwith %}
</li>
</ul>
</div>
@@ -578,9 +582,9 @@
<div class="row" id="mycommentslist">
<div class="col-12">
<ul class="list-group list-group-flush">
- {% for own_comment in own_commentsx %}
+ {% for own_comment in own_comments %}
<li class="list-group-item">
- {% include 'comments/_comment_card_extended_content.html' with comment=own_comment %}
+ {% include 'comments/_comment_card_extended_for_author.html' with comment=own_comment %}
</li>
{% empty %}
<li class="list-group-item"><em>You have not commented yet.</em></li>
@@ -607,7 +611,7 @@
<ul class="list-group list-group-flush">
{% for own_reply in own_authorreplies %}
<li class="list-group-item">
- {% include 'comments/_comment_card_extended_content.html' with comment=own_reply %}
+ {% include 'comments/_comment_card_extended_for_author.html' with comment=own_reply %}
</li>
{% empty %}
<li class="list-group-item"><em>You do not have Author Replies yet.</em></li>
diff --git a/scipost/test_services.py b/scipost/test_services.py
index 727a20213e84256e79fc3d85f875df77f9be56a7..cce23f55eca75dbf7a4a3aa0a845ead809d5c964 100644
--- a/scipost/test_services.py
+++ b/scipost/test_services.py
@@ -12,7 +12,7 @@ class ArxivCallerTest(TestCase):
caller = ArxivCaller('1612.07611v1')
self.assertTrue(caller.is_valid)
correct_data = {
- 'pub_abstract': 'The Berezinskii-Kosterlitz-Thouless (BKT) transitions of the six-state clock\nmodel on the square lattice are investigated by means of the corner-transfer\nmatrix renormalization group method. The classical analogue of the entanglement\nentropy $S( L, T )$ is calculated for $L$ by $L$ square system up to $L = 129$,\nas a function of temperature $T$. The entropy has a peak at $T = T^{*}_{~}( L\n)$, where the temperature depends on both $L$ and boundary conditions. Applying\nthe finite-size scaling to $T^{*}_{~}( L )$ and assuming the presence of BKT\ntransitions, the transition temperature is estimated to be $T_1^{~} = 0.70$ and\n$T_2^{~} = 0.88$. The obtained results agree with previous analyses. It should\nbe noted that no thermodynamic function is used in this study.', 'author_list': ['Roman KrÄmár', 'Andrej Gendiar', 'Tomotoshi Nishino'], 'arxiv_link': 'http://arxiv.org/abs/1612.07611v1', 'pub_title': 'Phase transition of the six-state clock model observed from the\n entanglement entropy', 'pub_date': datetime.date(2016, 12, 22)
+ 'pub_abstract': 'The Berezinskii-Kosterlitz-Thouless (BKT) transitions of the six-state clock\nmodel on the square lattice are investigated by means of the corner-transfer\nmatrix renormalization group method. The classical analogue of the entanglement\nentropy $S( L, T )$ is calculated for $L$ by $L$ square system up to $L = 129$,\nas a function of temperature $T$. The entropy has a peak at $T = T^{*}_{~}( L\n)$, where the temperature depends on both $L$ and boundary conditions. Applying\nthe finite-size scaling to $T^{*}_{~}( L )$ and assuming the presence of BKT\ntransitions, the transition temperature is estimated to be $T_1^{~} = 0.70$ and\n$T_2^{~} = 0.88$. The obtained results agree with previous analyses. It should\nbe noted that no thermodynamic function is used in this study.', 'author_list': ['Roman KrÄmár', 'Andrej Gendiar', 'Tomotoshi Nishino'], 'arxiv_link': 'http://arxiv.org/abs/1612.07611v1', 'title': 'Phase transition of the six-state clock model observed from the\n entanglement entropy', 'pub_date': datetime.date(2016, 12, 22)
}
self.assertEqual(caller.data, correct_data)
@@ -20,7 +20,7 @@ class ArxivCallerTest(TestCase):
caller = ArxivCaller('cond-mat/0612480')
self.assertTrue(caller.is_valid)
correct_data = {
- 'author_list': ['Kouji Ueda', 'Chenglong Jin', 'Naokazu Shibata', 'Yasuhiro Hieida', 'Tomotoshi Nishino'], 'pub_date': datetime.date(2006, 12, 19), 'arxiv_link': 'http://arxiv.org/abs/cond-mat/0612480v2', 'pub_abstract': 'A kind of least action principle is introduced for the discrete time\nevolution of one-dimensional quantum lattice models. Based on this principle,\nwe obtain an optimal condition for the matrix product states on succeeding time\nslices generated by the real-time density matrix renormalization group method.\nThis optimization can also be applied to classical simulations of quantum\ncircuits. We discuss the time reversal symmetry in the fully optimized MPS.', 'pub_title': 'Least Action Principle for the Real-Time Density Matrix Renormalization\n Group'
+ 'author_list': ['Kouji Ueda', 'Chenglong Jin', 'Naokazu Shibata', 'Yasuhiro Hieida', 'Tomotoshi Nishino'], 'pub_date': datetime.date(2006, 12, 19), 'arxiv_link': 'http://arxiv.org/abs/cond-mat/0612480v2', 'pub_abstract': 'A kind of least action principle is introduced for the discrete time\nevolution of one-dimensional quantum lattice models. Based on this principle,\nwe obtain an optimal condition for the matrix product states on succeeding time\nslices generated by the real-time density matrix renormalization group method.\nThis optimization can also be applied to classical simulations of quantum\ncircuits. We discuss the time reversal symmetry in the fully optimized MPS.', 'title': 'Least Action Principle for the Real-Time Density Matrix Renormalization\n Group'
}
self.assertEqual(caller.data, correct_data)
@@ -39,7 +39,7 @@ class DOICallerTest(TestCase):
'author_list': [
'R. Vlijm', 'M. Ganahl', 'D. Fioretto', 'M. Brockmann', 'M. Haque', 'H. G. Evertz', 'J.-S. Caux'],
'volume': '92',
- 'pub_title': 'Quasi-soliton scattering in quantum spin chains'
+ 'title': 'Quasi-soliton scattering in quantum spin chains'
}
self.assertTrue(caller.is_valid)
self.assertEqual(caller.data, correct_data)
@@ -49,7 +49,7 @@ class DOICallerTest(TestCase):
correct_data = {
'pub_date': '2017-04-04',
'journal': 'SciPost Physics',
- 'pub_title': 'One-particle density matrix of trapped one-dimensional impenetrable bosons from conformal invariance',
+ 'title': 'One-particle density matrix of trapped one-dimensional impenetrable bosons from conformal invariance',
'pages': '',
'volume': '2',
'author_list': ['Yannis Brun', 'Jerome Dubail']
diff --git a/scipost/utils.py b/scipost/utils.py
index 3af0f72d92b19ed5e9ebedee46971ff3d681ffeb..7fd4653f98d60cb3e99ff7f2ed383e7caf283d97 100644
--- a/scipost/utils.py
+++ b/scipost/utils.py
@@ -403,13 +403,13 @@ class Utils(BaseMailUtil):
'Contributor to the site.')
email_text_html += (
'<p>Your work has been cited in a paper published by SciPost,</p>'
- '<p>{{ pub_title }}</p> <p>by {{ pub_author_list }}</p>'
+ '<p>{{ title }}</p> <p>by {{ pub_author_list }}</p>'
'(published as <a href="https://scipost.org/{{ doi_label }}">{{ citation }}</a>).'
'</p>'
'\n<p>I would hereby like to use this opportunity to quickly introduce '
'you to the SciPost initiative, and to invite you to become an active '
'Contributor to the site.</p>')
- email_context['pub_title'] = cls.invitation.cited_in_publication.title
+ email_context['title'] = cls.invitation.cited_in_publication.title
email_context['pub_author_list'] = cls.invitation.cited_in_publication.author_list
email_context['doi_label'] = cls.invitation.cited_in_publication.doi_label
email_context['citation'] = cls.invitation.cited_in_publication.citation()
@@ -640,7 +640,7 @@ class Utils(BaseMailUtil):
email_text_html += (
'<p>We would like to notify you that '
'your work has been cited in a paper published by SciPost,</p>'
- '<p>{{ pub_title }}</p><p>by {{ pub_author_list }}</p>'
+ '<p>{{ title }}</p><p>by {{ pub_author_list }}</p>'
'<p>(published as <a href="https://scipost.org/{{ doi_label }}">'
'{{ citation }}</a>).</p>'
'<p>We hope you will find this paper of interest to your own research.</p>'
@@ -648,7 +648,7 @@ class Utils(BaseMailUtil):
+ EMAIL_FOOTER + '<br/>'
'\n<p style="font-size: 10px;">Don\'t want to receive such emails? '
'<a href="%s">Unsubscribe</a>.</p>' % url_unsubscribe)
- email_context['pub_title'] = cls.notification.cited_in_publication.title
+ email_context['title'] = cls.notification.cited_in_publication.title
email_context['pub_author_list'] = cls.notification.cited_in_publication.author_list
email_context['doi_label'] = cls.notification.cited_in_publication.doi_label
email_context['citation'] = cls.notification.cited_in_publication.citation()
diff --git a/scipost/views.py b/scipost/views.py
index c2ac4ee4cf74bdf087ed1fa458c1ac9e2f749bb4..3d104c216431e10c62d5b766c6b209b6dad9c353 100644
--- a/scipost/views.py
+++ b/scipost/views.py
@@ -90,7 +90,7 @@ def documentsSearchResults(query):
NEEDS UPDATING with e.g. Haystack.
"""
publication_query = get_query(query, ['title', 'author_list', 'abstract', 'doi_label'])
- commentary_query = get_query(query, ['pub_title', 'author_list', 'pub_abstract'])
+ commentary_query = get_query(query, ['title', 'author_list', 'pub_abstract'])
submission_query = get_query(query, ['title', 'author_list', 'abstract'])
thesislink_query = get_query(query, ['title', 'author', 'abstract', 'supervisor'])
comment_query = get_query(query, ['comment_text'])
@@ -828,7 +828,7 @@ def personal_page(request):
if contributor.is_VE():
nr_commentary_page_requests_to_vet = (Commentary.objects.awaiting_vetting()
.exclude(requested_by=contributor).count())
- nr_comments_to_vet = Comment.objects.filter(status=0).count()
+ nr_comments_to_vet = Comment.objects.awaiting_vetting().count()
nr_thesislink_requests_to_vet = ThesisLink.objects.filter(vetted=False).count()
nr_authorship_claims_to_vet = AuthorshipClaim.objects.filter(status='0').count()
@@ -845,9 +845,7 @@ def personal_page(request):
own_submissions = (Submission.objects
.filter(authors__in=[contributor], is_current=True)
.order_by('-submission_date'))
- own_commentaries = (Commentary.objects
- .filter(authors__in=[contributor])
- .order_by('-latest_activity'))
+ own_commentaries = Commentary.objects.filter(authors=contributor).order_by('-latest_activity')
own_thesislinks = ThesisLink.objects.filter(author_as_cont__in=[contributor])
nr_submission_authorships_to_claim = (Submission.objects.filter(
author_list__contains=contributor.user.last_name)
@@ -867,11 +865,10 @@ def personal_page(request):
.exclude(author_claims__in=[contributor])
.exclude(author_false_claims__in=[contributor])
.count())
- own_comments = (Comment.objects.select_related('author', 'submission')
- .filter(author=contributor, is_author_reply=False)
+ own_comments = (Comment.objects.filter(author=contributor, is_author_reply=False)
+ .select_related('author', 'submission')
.order_by('-date_submitted'))
- own_authorreplies = (Comment.objects
- .filter(author=contributor, is_author_reply=True)
+ own_authorreplies = (Comment.objects.filter(author=contributor, is_author_reply=True)
.order_by('-date_submitted'))
appellation = contributor.get_title_display() + ' ' + contributor.user.last_name
diff --git a/submissions/admin.py b/submissions/admin.py
index 1095426dbbb30269de89a0db9bb3979aea60546a..2d88cdc52264761d1405028e361c86c7ec52982f 100644
--- a/submissions/admin.py
+++ b/submissions/admin.py
@@ -1,14 +1,19 @@
from django.contrib import admin
+from django.contrib.contenttypes.admin import GenericTabularInline
from django import forms
from guardian.admin import GuardedModelAdmin
+from comments.models import Comment
from submissions.models import Submission, EditorialAssignment, RefereeInvitation, Report,\
EditorialCommunication, EICRecommendation, SubmissionEvent
-
from scipost.models import Contributor
+class CommentsGenericInline(GenericTabularInline):
+ model = Comment
+
+
def submission_short_title(obj):
return obj.submission.title[:30]
@@ -33,8 +38,10 @@ class SubmissionAdmin(GuardedModelAdmin):
search_fields = ['submitted_by__user__last_name', 'title', 'author_list', 'abstract']
list_display = ('title', 'author_list', 'status', 'submission_date', 'publication',)
date_hierarchy = 'submission_date'
- list_filter = ('status', 'discipline', 'submission_type', )
+ list_filter = ('status', 'discipline', 'submission_type',)
form = SubmissionAdminForm
+ # inlines = (CommentsGenericInline,)
+ exclude = ('comments', 'comments_old')
admin.site.register(Submission, SubmissionAdmin)
diff --git a/submissions/models.py b/submissions/models.py
index d189fa68f681e8b588a1bfd1b06b524ae6802a3c..cd0056ce17b3f73fc836d7f01c704745a6c9e33d 100644
--- a/submissions/models.py
+++ b/submissions/models.py
@@ -1,8 +1,10 @@
import datetime
+from django.contrib.postgres.fields import JSONField
+from django.contrib.contenttypes.fields import GenericRelation
from django.utils import timezone
from django.db import models
-from django.contrib.postgres.fields import JSONField
+from django.db.models import Q
from django.urls import reverse
from django.utils.functional import cached_property
@@ -17,6 +19,7 @@ from .managers import SubmissionManager, EditorialAssignmentManager, EICRecommen
from .utils import ShortSubmissionCycle, DirectRecommendationSubmissionCycle,\
GeneralSubmissionCycle
+from comments.models import Comment
from scipost.behaviors import TimeStampedModel
from scipost.constants import TITLE_CHOICES
from scipost.fields import ChoiceArrayField
@@ -49,6 +52,7 @@ class Submission(models.Model):
secondary_areas = ChoiceArrayField(
models.CharField(max_length=10, choices=SCIPOST_SUBJECT_AREAS),
blank=True, null=True)
+
# Status set by Editors
status = models.CharField(max_length=30, choices=SUBMISSION_STATUS, default=STATUS_UNASSIGNED)
refereeing_cycle = models.CharField(max_length=30, choices=SUBMISSION_CYCLES,
@@ -58,6 +62,7 @@ class Submission(models.Model):
submission_type = models.CharField(max_length=10, choices=SUBMISSION_TYPE,
blank=True, null=True, default=None)
submitted_by = models.ForeignKey('scipost.Contributor', on_delete=models.CASCADE)
+
# Replace this by foreignkey?
submitted_to_journal = models.CharField(max_length=30, choices=SCIPOST_JOURNALS_SUBMIT,
verbose_name="Journal to be submitted to")
@@ -71,6 +76,9 @@ class Submission(models.Model):
related_name='authors_sub_false_claims')
abstract = models.TextField()
+ # Comments can be added to a Submission
+ comments = GenericRelation('comments.Comment', related_query_name='submissions')
+
# Arxiv identifiers with/without version number
arxiv_identifier_w_vn_nr = models.CharField(max_length=15, default='0000.00000v0')
arxiv_identifier_wo_vn_nr = models.CharField(max_length=10, default='0000.00000')
@@ -115,6 +123,16 @@ class Submission(models.Model):
pass
return header
+ def comments_set_complete(self):
+ """
+ Return comments to Submission, comments on Reports of Submission and
+ nested comments related to this Submission.
+ """
+ return Comment.objects.filter(Q(submissions=self) |
+ Q(reports__submission=self) |
+ Q(comments__reports__submission=self) |
+ Q(comments__submissions=self)).distinct()
+
def _update_cycle(self):
"""
Append the specific submission cycle to the instance to eventually handle the
@@ -322,6 +340,9 @@ class Report(models.Model):
report = models.TextField()
requested_changes = models.TextField(verbose_name="requested changes", blank=True)
+ # Comments can be added to a Submission
+ comments = GenericRelation('comments.Comment', related_query_name='reports')
+
# Qualities:
validity = models.PositiveSmallIntegerField(choices=RANKING_CHOICES,
null=True, blank=True)
@@ -357,6 +378,12 @@ class Report(models.Model):
return (self.author.user.first_name + ' ' + self.author.user.last_name + ' on ' +
self.submission.title[:50] + ' by ' + self.submission.author_list[:50])
+ def save(self, *args, **kwargs):
+ # Control Report count per Submission.
+ if not self.report_nr:
+ self.report_nr = self.submission.reports.count() + 1
+ return super().save(*args, **kwargs)
+
def get_absolute_url(self):
return self.submission.get_absolute_url() + '#report_' + str(self.report_nr)
@@ -365,11 +392,13 @@ class Report(models.Model):
if self.doi_label:
return '10.21468/' + self.doi_label
- def save(self, *args, **kwargs):
- # Control Report count per Submission.
- if not self.report_nr:
- self.report_nr = self.submission.reports.count() + 1
- return super().save(*args, **kwargs)
+ @cached_property
+ def title(self):
+ """
+ This property is (mainly) used to let Comments get the title of the Submission without
+ annoying logic.
+ """
+ return self.submission.title
@cached_property
def is_followup_report(self):
diff --git a/submissions/templates/submissions/_refereeing_pack_tex_template.html b/submissions/templates/submissions/_refereeing_pack_tex_template.html
index 536202975620088d90e191870ed6d99f45f55df6..707246a319c37864228ca28e761e34e2c3ee3687 100644
--- a/submissions/templates/submissions/_refereeing_pack_tex_template.html
+++ b/submissions/templates/submissions/_refereeing_pack_tex_template.html
@@ -169,12 +169,12 @@ Submitted to {{submission.get_submitted_to_journal_display}}
{{report.requested_changes|linebreaktex}}
- {% if report.comment_set.vetted %}
+ {% if report.comments.vetted %}
\newpage
\pagestyle{SPstyle}
\section*{Comments and Author Replies to this Report}
- {% for comment in report.comment_set.vetted %}
+ {% for comment in report.comments.vetted %}
\addcontentsline{toc}{subsection}{\protect\numberline{}{% if comment.is_author_reply %}Author Reply{% else %}Comment{% endif %} {{forloop.counter}} to Report by {% if comment.anonymous %}anonymous{% else %}{{comment.author.user.first_name}} {{comment.author.user.last_name}}{% endif %} }
\subsection*{ {% if comment.is_author_reply %}Author Reply{% else %}Comment{% endif %} {{forloop.counter}} to Report by {% if comment.anonymous %}anonymous{% else %}{{comment.author.user.first_name}} {{comment.author.user.last_name}}{% endif %} }
diff --git a/submissions/templates/submissions/_single_public_report.html b/submissions/templates/submissions/_single_public_report.html
index cc4b233b4540fd5b969181a41377ac181d727a70..efdc5c5144fb7f7dde0959338e2d3c9b751582b4 100644
--- a/submissions/templates/submissions/_single_public_report.html
+++ b/submissions/templates/submissions/_single_public_report.html
@@ -6,7 +6,7 @@
<h3><a href="{% url 'comments:reply_to_report' report_id=report.id %}">Reply to this Report</a> (authors only)</h3>
{% endif %}
- {% for reply in report.comment_set.vetted %}
+ {% for reply in report.comments.vetted %}
{% include 'comments/_single_comment_with_link.html' with comment=reply perms=perms user=user %}
{% endfor %}
{% endblock %}
diff --git a/submissions/templates/submissions/editorial_page.html b/submissions/templates/submissions/editorial_page.html
index 3491f385ae65e41c9808a2a7e857825f67a18100..65a024d1e8dcdf5ecf47910a1fd5f345f84e2845 100644
--- a/submissions/templates/submissions/editorial_page.html
+++ b/submissions/templates/submissions/editorial_page.html
@@ -184,7 +184,8 @@
<li>All Reports have been vetted.</li>
{% endif %}
{% endwith %}
- {% with submission.comments.awaiting_vetting as comments %}
+
+ {% with submission.comments_set_complete.awaiting_vetting as comments %}
{% if comments %}
<li>
Vet submitted Comment{{comments|pluralize}}:
@@ -198,6 +199,7 @@
<li>All Comments have been vetted.</li>
{% endif %}
{% endwith %}
+
{% if not submission.reporting_deadline_has_passed %}
<li><a href="{% url 'submissions:close_refereeing_round' arxiv_identifier_w_vn_nr=submission.arxiv_identifier_w_vn_nr %}">Close the refereeing round</a> (deactivates submission of new Reports and Comments)</li>
{% endif %}
diff --git a/submissions/templates/submissions/submission_detail.html b/submissions/templates/submissions/submission_detail.html
index 4e6188df9338e987679e3648cd003496bd609181..383dfd162c3a4a5880e430d525cb63fa764ce7ce 100644
--- a/submissions/templates/submissions/submission_detail.html
+++ b/submissions/templates/submissions/submission_detail.html
@@ -6,27 +6,12 @@
{% load scipost_extras %}
{% load submissions_extras %}
-{% load filename %}
-{% load file_extentions %}
<script>
$(document).ready(function(){
- $("#invitedreportsbutton").click(function(){
- $("#invitedreportslist").toggle();
- });
-
- 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]);
- })
+ $("#invitedreportsbutton").click(function(){
+ $("#invitedreportslist").toggle();
+ });
});
</script>
@@ -201,7 +186,7 @@
{% endif %}
-{% include 'scipost/comments_block.html' %}
+{% include 'scipost/comments_block.html' with comments=submission.comments.vetted %}
{% include 'comments/new_comment.html' with object_id=submission.id type_of_object='submission' open_for_commenting=submission.open_for_commenting %}
diff --git a/templates/email/comment_vet_accepted.html b/templates/email/comment_vet_accepted.html
index de7c50065e5514e37fda15478c01178ffc68ce69..60908ef568720835558a91280c070fc2a48b7a0f 100644
--- a/templates/email/comment_vet_accepted.html
+++ b/templates/email/comment_vet_accepted.html
@@ -3,13 +3,7 @@
<p>
The Comment you have submitted, concerning publication with title
- {% if comment.commentary %}
- {{comment.commentary.pub_title}} by {{comment.commentary.author_list}} (<a href="https://scipost.org{{comment.commentary.get_absolute_url}}">see Commentary Page on SciPost.org</a>)
- {% elif comment.submission %}
- {{comment.submission.title}} by {{comment.submission.author_list}} (<a href="https://scipost.org{{comment.submission.get_absolute_url}}">see Submission Page on SciPost.org</a>)
- {% elif comment.thesislink %}
- {{comment.thesislink.title}} by {{comment.thesislink.author}} (<a href="https://scipost.org{{comment.thesislink.get_absolute_url}}">see Thesis Link on SciPost.org</a>)
- {% endif %}
+ {{comment.core_content_object.title}} by {% if comment.core_content_object.author_list %}{{comment.core_content_object.author_list}}{% elif comment.core_content_object.author %}{{comment.core_content_object.author}}{% endif %} (<a href="https://scipost.org{{comment.get_absolute_url}}">see on SciPost.org</a>)
has been accepted and published online.
</p>
<p>
diff --git a/templates/email/comment_vet_accepted.txt b/templates/email/comment_vet_accepted.txt
index 79b53c5b8f0629c745ede71599301a9fffdbc838..c717f5fe32e03c5c4c1724f5590c7bc6b2a02a0e 100644
--- a/templates/email/comment_vet_accepted.txt
+++ b/templates/email/comment_vet_accepted.txt
@@ -3,13 +3,8 @@ Dear {{comment.author.get_title_display}} {{comment.author.user.last_name}}
The Comment you have submitted, concerning publication with title
-{% if comment.commentary %}
- {{comment.commentary.pub_title}} by {{comment.commentary.author_list}} at Commentary Page https://scipost.org{{comment.commentary.get_absolute_url}}
-{% elif comment.submission %}
- {{comment.submission.title}} by {{comment.submission.author_list}} at Submission page https://scipost.org{{comment.submission.get_absolute_url}}
-{% elif comment.thesislink %}
- {{comment.thesislink.title}} by {{comment.thesislink.author}} at Thesis Link https://scipost.org{{comment.thesislink.get_absolute_url}}
-{% endif %}
+{{comment.core_content_object.title}} by {% if comment.core_content_object.author_list %}{{comment.core_content_object.author_list}}{% elif comment.core_content_object.author %}{{comment.core_content_object.author}}{% endif %} at https://scipost.org{{comment.get_absolute_url}}
+
has been accepted and published online.
\n\nWe copy it below for your convenience.
diff --git a/templates/email/comment_vet_rejected.html b/templates/email/comment_vet_rejected.html
index e6a5dd598b162e45792a80fe151f31bcb95178d8..678771fb32954fdfb86ebf20402bad97f421ef3c 100644
--- a/templates/email/comment_vet_rejected.html
+++ b/templates/email/comment_vet_rejected.html
@@ -3,13 +3,7 @@
<p>
The Comment you have submitted, concerning publication with title
- {% if comment.commentary %}
- {{comment.commentary.pub_title}} by {{comment.commentary.author_list}} (<a href="https://scipost.org{{comment.commentary.get_absolute_url}}">see Commentary Page on SciPost.org</a>)
- {% elif comment.submission %}
- {{comment.submission.title}} by {{comment.submission.author_list}} (<a href="https://scipost.org{{comment.submission.get_absolute_url}}">see Submission Page on SciPost.org</a>)
- {% elif comment.thesislink %}
- {{comment.thesislink.title}} by {{comment.thesislink.author}} (<a href="https://scipost.org{{comment.thesislink.get_absolute_url}}">see Thesis Link on SciPost.org</a>)
- {% endif %}
+ {{comment.core_content_object.title}} by {% if comment.core_content_object.author_list %}{{comment.core_content_object.author_list}}{% elif comment.core_content_object.author %}{{comment.core_content_object.author}}{% endif %} (<a href="https://scipost.org{{comment.get_absolute_url}}">see on SciPost.org</a>)
has been rejected for the following reason: {{comment.get_status_display}}.
</p>
<p>
diff --git a/templates/email/comment_vet_rejected.txt b/templates/email/comment_vet_rejected.txt
index 2eed6e1bae03f8e9f8bb083073d4a544d042b2e6..c489d65acf3725c63f1542cfa0e2288a80f0ac22 100644
--- a/templates/email/comment_vet_rejected.txt
+++ b/templates/email/comment_vet_rejected.txt
@@ -3,13 +3,7 @@ Dear {{comment.author.get_title_display}} {{comment.author.user.last_name}}
The Comment you have submitted, concerning publication with title
-{% if comment.commentary %}
- {{comment.commentary.pub_title}} by {{comment.commentary.author_list}} at Commentary Page https://scipost.org{{comment.commentary.get_absolute_url}}
-{% elif comment.submission %}
- {{comment.submission.title}} by {{comment.submission.author_list}} at Submission page https://scipost.org{{comment.submission.get_absolute_url}}
-{% elif comment.thesislink %}
- {{comment.thesislink.title}} by {{comment.thesislink.author}} at Thesis Link https://scipost.org{{comment.thesislink.get_absolute_url}}
-{% endif %}
+{{comment.core_content_object.title}} by {% if comment.core_content_object.author_list %}{{comment.core_content_object.author_list}}{% elif comment.core_content_object.author %}{{comment.core_content_object.author}}{% endif %} at https://scipost.org{{comment.get_absolute_url}}
has been rejected for the following reason: {{comment.get_status_display}}.
diff --git a/theses/models.py b/theses/models.py
index 40ce6e673a79eeeba2fd06b9cd63b0c163b9f8dc..e15ebe73301fc9b7b5282a5576ba81a7b515ee15 100644
--- a/theses/models.py
+++ b/theses/models.py
@@ -1,10 +1,10 @@
from django.db import models
+from django.contrib.contenttypes.fields import GenericRelation
from django.urls import reverse
from django.utils import timezone
from journals.constants import SCIPOST_JOURNALS_DOMAINS
from scipost.constants import SCIPOST_DISCIPLINES, SCIPOST_SUBJECT_AREAS
-from scipost.models import Contributor
from .constants import THESIS_TYPES
from .managers import ThesisLinkManager
@@ -13,12 +13,12 @@ from .managers import ThesisLinkManager
class ThesisLink(models.Model):
""" An URL pointing to a thesis """
requested_by = models.ForeignKey(
- Contributor, blank=True, null=True,
+ 'scipost.Contributor', blank=True, null=True,
related_name='thesislink_requested_by',
on_delete=models.CASCADE)
vetted = models.BooleanField(default=False)
vetted_by = models.ForeignKey(
- Contributor, blank=True, null=True,
+ 'scipost.Contributor', blank=True, null=True,
on_delete=models.CASCADE)
type = models.CharField(choices=THESIS_TYPES, max_length=3)
discipline = models.CharField(
@@ -36,17 +36,17 @@ class ThesisLink(models.Model):
pub_link = models.URLField(verbose_name='URL (external repository)')
author = models.CharField(max_length=1000)
author_as_cont = models.ManyToManyField(
- Contributor, blank=True,
+ 'scipost.Contributor', blank=True,
related_name='author_cont')
author_claims = models.ManyToManyField(
- Contributor, blank=True,
+ 'scipost.Contributor', blank=True,
related_name='authors_thesis_claims')
author_false_claims = models.ManyToManyField(
- Contributor, blank=True,
+ 'scipost.Contributor', blank=True,
related_name='authors_thesis_false_claims')
supervisor = models.CharField(max_length=1000, default='')
supervisor_as_cont = models.ManyToManyField(
- Contributor, blank=True,
+ 'scipost.Contributor', blank=True,
verbose_name='supervisor(s)',
related_name='supervisor_cont')
institution = models.CharField(
@@ -56,6 +56,9 @@ class ThesisLink(models.Model):
abstract = models.TextField(verbose_name='abstract, outline or summary')
latest_activity = models.DateTimeField(default=timezone.now)
+ # Comments can be added to a ThesisLink
+ comments = GenericRelation('comments.Comment', related_query_name='theses')
+
objects = ThesisLinkManager()
def __str__(self):
diff --git a/theses/templates/theses/_thesislink_card_content.html b/theses/templates/theses/_thesislink_card_content.html
index 89fbde9224a364d55fb1851c9e474345a82a8d2c..f8549c9a5e6d471f7b4ec4230ef2f85d789dea98 100644
--- a/theses/templates/theses/_thesislink_card_content.html
+++ b/theses/templates/theses/_thesislink_card_content.html
@@ -1,5 +1,3 @@
-{% load theses_extras %}
-
<div class="card-block">
<h3 class="card-title">
<a href="{% url 'theses:thesis' thesislink_id=thesislink.id %}">{{ thesislink.title }}</a>
diff --git a/theses/templates/theses/_thesislink_information.html b/theses/templates/theses/_thesislink_information.html
index 5bc93fb0a777ad196559e29b2a749fcbf06cc879..204eb9d3fcafbc84a714d08659eb7d782e9a9d13 100644
--- a/theses/templates/theses/_thesislink_information.html
+++ b/theses/templates/theses/_thesislink_information.html
@@ -1,5 +1,3 @@
-{% load theses_extras %}
-
<table class="mb-3">
<tr>
<td>Title: </td><td> </td><td>{{ thesislink.title }}</td>
@@ -18,16 +16,16 @@
</td>
</tr>
<tr>
- <td>Type: </td><td></td><td> {{ thesislink|type }}</td>
+ <td>Type: </td><td></td><td> {{ thesislink.get_type_display }}</td>
</tr>
<tr>
- <td>Discipline: </td><td></td><td>{{ thesislink|discipline }}</td>
+ <td>Discipline: </td><td></td><td>{{ thesislink.get_discipline_display }}</td>
</tr>
<tr>
- <td>Domain: </td><td></td><td>{{ thesislink|domain }}</td>
+ <td>Domain: </td><td></td><td>{{ thesislink.get_domain_display }}</td>
</tr>
<tr>
- <td>Subject area: </td><td></td><td> {{ thesislink|subject_area }} </td>
+ <td>Subject area: </td><td></td><td> {{ thesislink.get_subject_area_display }} </td>
</tr>
<tr>
<td>URL: </td><td> </td><td><a href="{{ thesislink.pub_link }}" target="_blank">{{ thesislink.pub_link }}</a></td>
diff --git a/theses/templates/theses/thesis_detail.html b/theses/templates/theses/thesis_detail.html
index 12a49b417caea35912379368119483f12134d5b5..7ed53d775a8bdfde69e842e8803cd6b4d6ec91a9 100644
--- a/theses/templates/theses/thesis_detail.html
+++ b/theses/templates/theses/thesis_detail.html
@@ -1,41 +1,12 @@
{% extends 'scipost/base.html' %}
-{% block pagetitle %}: Thesis Link detail{% endblock pagetitle %}
-
-{% block headsup %}
-
{% load scipost_extras %}
-<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>
-
-{% endblock headsup %}
+{% block pagetitle %}: Thesis Link detail{% endblock pagetitle %}
{% block content %}
-<div class="row">
- <div class="col-12">
- <h1 class="highlight">SciPost Thesis Link</h1>
- </div>
-</div>
-
-<hr />
+<h1 class="highlight">SciPost Thesis Link</h1>
<div class="row">
<div class="col-12">
@@ -43,7 +14,7 @@
</div>
</div>
-{% include 'scipost/comments_block.html' %}
+{% include 'scipost/comments_block.html' with comments=thesislink.comments.vetted type_of_object='ThesisLink' %}
{% include 'comments/new_comment.html' with object_id=thesislink.id type_of_object='thesislink' open_for_commenting=thesislink.open_for_commenting %}
diff --git a/theses/templates/theses/unvetted_thesislinks.html b/theses/templates/theses/unvetted_thesislinks.html
index 6846720a4d81155ee3d888a68a48187bc4df8ad8..7ac0723a3d76971d1d78370466da449ac31fd943 100644
--- a/theses/templates/theses/unvetted_thesislinks.html
+++ b/theses/templates/theses/unvetted_thesislinks.html
@@ -2,10 +2,6 @@
{% block pagetitle %}: Unvetted Thesis Links{% endblock pagetitle %}
-{% block headsup %}
-
-{% endblock headsup %}
-
{% block content %}
<div class="row">
diff --git a/theses/templates/theses/vet_thesislink.html b/theses/templates/theses/vet_thesislink.html
index 8822dfff11c61f69a0a0ded2b8e5ea12b0004f33..30b1bb1831560e02be8b702764931b10ddff418f 100644
--- a/theses/templates/theses/vet_thesislink.html
+++ b/theses/templates/theses/vet_thesislink.html
@@ -4,10 +4,6 @@
{% block pagetitle %}: Unvetted Thesis Links{% endblock pagetitle %}
-{% block headsup %}
-
-{% endblock headsup %}
-
{% block content %}
<div class="row">
diff --git a/theses/templatetags/theses_extras.py b/theses/templatetags/theses_extras.py
deleted file mode 100644
index e60c4ecf59d309bd7596b3574c08f021dc1de282..0000000000000000000000000000000000000000
--- a/theses/templatetags/theses_extras.py
+++ /dev/null
@@ -1,27 +0,0 @@
-from django import template
-
-register = template.Library()
-
-
-@register.filter
-def type(thesislink):
- # deprecated method, to be removed in future
- return thesislink.get_type_display()
-
-
-@register.filter
-def discipline(thesislink):
- # deprecated method, to be removed in future
- return thesislink.get_discipline_display()
-
-
-@register.filter
-def domain(thesislink):
- # deprecated method, to be removed in future
- return thesislink.get_domain_display()
-
-
-@register.filter
-def subject_area(thesislink):
- # deprecated method, to be removed in future
- return thesislink.get_subject_area_display()
diff --git a/theses/views.py b/theses/views.py
index 72856c885224b4f0c2534714e737e208ed9b8fbb..ac9558ad9650943b63c1a7f45d565e81bb6bb7de 100644
--- a/theses/views.py
+++ b/theses/views.py
@@ -4,7 +4,7 @@ from django.utils import timezone
from django.shortcuts import get_object_or_404, render
from django.contrib.auth.decorators import permission_required
from django.contrib import messages
-from django.core.urlresolvers import reverse, reverse_lazy
+from django.core.urlresolvers import reverse_lazy
from django.http import HttpResponseRedirect
from django.views.generic.edit import CreateView, UpdateView
from django.views.generic.list import ListView
@@ -86,24 +86,24 @@ class ThesisListView(ListView):
# Context is not saved to View object by default
self.pre_context = self.kwargs
- # Browse is discipline is given
+ # Browse if discipline is given
if 'discipline' in self.kwargs:
self.pre_context['browse'] = True
# Queryset for browsing
if self.kwargs.get('browse', False):
- return self.model.objects.vetted().filter(
- discipline=self.kwargs['discipline'],
- latest_activity__gte=timezone.now() + datetime.timedelta(
- weeks=-int(self.kwargs['nrweeksback'])),
- )
+ return (self.model.objects.vetted()
+ .filter(discipline=self.kwargs['discipline'],
+ latest_activity__gte=timezone.now() + datetime.timedelta(
+ weeks=-int(self.kwargs['nrweeksback'])))
+ .order_by('-latest_activity'))
# Queryset for searchform is processed by managers
form = self.form(self.request.GET)
if form.is_valid() and form.has_changed():
- return self.model.objects.search_results(form)
+ return self.model.objects.search_results(form).order_by('-latest_activity')
self.pre_context['recent'] = True
- return self.model.objects.vetted()
+ return self.model.objects.vetted().order_by('-latest_activity')
def get_context_data(self, **kwargs):
# Update the context data from `get_queryset`
@@ -120,10 +120,5 @@ def thesis_detail(request, thesislink_id):
thesislink = get_object_or_404(ThesisLink, pk=thesislink_id)
form = CommentForm()
- comments = thesislink.comment_set
- author_replies = comments.filter(is_author_reply=True)
-
- context = {'thesislink': thesislink,
- 'comments': comments.vetted().order_by('date_submitted'),
- 'author_replies': author_replies, 'form': form}
+ context = {'thesislink': thesislink, 'form': form}
return render(request, 'theses/thesis_detail.html', context)