diff --git a/commentaries/views.py b/commentaries/views.py
index c64fef01ee93e5204af8b3fb45b1fadbdf56cd58..7d1db2829e0a3af79fd5e3c0f32a7673e65f7e7c 100644
--- a/commentaries/views.py
+++ b/commentaries/views.py
@@ -75,21 +75,21 @@ def vet_commentary_request_ack(request, commentary_id):
# accept the commentary as is
commentary.vetted = True
commentary.save()
- email_text = 'Dear ' + title_dict[commentary.requested_by.title] + ' ' + commentary.requested_by.user.last_name + ', \n\n The Commentary Page you have requested, concerning publication with title ' + commentary.pub_title + ' by ' + commentary.author_list + ', has been activated. You are now welcome to submit your comments.' + '\n\nThank you for your contribution, \nThe SciPost Team.'
+ email_text = 'Dear ' + title_dict[commentary.requested_by.title] + ' ' + commentary.requested_by.user.last_name + ', \n\nThe Commentary Page you have requested, concerning publication with title ' + commentary.pub_title + ' by ' + commentary.author_list + ', has been activated. You are now welcome to submit your comments.' + '\n\nThank you for your contribution, \nThe SciPost Team.'
emailmessage = EmailMessage('SciPost Commentary Page activated', email_text, 'commentaries@scipost.org', [commentary.requested_by.user.email, 'commentaries@scipost.org'], reply_to=['commentaries@scipost.org'])
emailmessage.send(fail_silently=False)
elif form.cleaned_data['action_option'] == '0':
# re-edit the form starting from the data provided
form2 = RequestCommentaryForm(initial={'pub_title': commentary.pub_title, 'arxiv_link': commentary.arxiv_link, 'pub_DOI_link': commentary.pub_DOI_link, 'author_list': commentary.author_list, 'pub_date': commentary.pub_date, 'pub_abstract': commentary.pub_abstract})
commentary.delete()
- email_text = 'Dear ' + title_dict[commentary.requested_by.title] + ' ' + commentary.requested_by.user.last_name + ', \n\n 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). You are now welcome to submit your comments.' + '\n\nThank you for your contribution, \nThe SciPost Team.'
+ email_text = 'Dear ' + title_dict[commentary.requested_by.title] + ' ' + commentary.requested_by.user.last_name + ', \n\nThe 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). You are now welcome to submit your comments.' + '\n\nThank you for your contribution, \nThe SciPost Team.'
emailmessage = EmailMessage('SciPost Commentary Page activated', email_text, 'commentaries@scipost.org', [commentary.requested_by.user.email, 'commentaries@scipost.org'], reply_to=['commentaries@scipost.org'])
emailmessage.send(fail_silently=False)
context = {'form': form2 }
return render(request, 'commentaries/request_commentary.html', context)
elif form.cleaned_data['action_option'] == '2':
# the commentary request is simply rejected
- email_text = 'Dear ' + title_dict[commentary.requested_by.title] + ' ' + commentary.requested_by.user.last_name + ', \n\n 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: ' + form.cleaned_data['refusal_reason'] + '.\n\nThank you for your interest, \nThe SciPost Team.'
+ email_text = 'Dear ' + title_dict[commentary.requested_by.title] + ' ' + commentary.requested_by.user.last_name + ', \n\nThe Commentary Page you have requested, concerning publication with title ' + commentary.pub_title + ' by ' + commentary.author_list + ', has not been activated for the following reason: ' + form.cleaned_data['refusal_reason'] + '.\n\nThank you for your interest, \nThe SciPost Team.'
if form.cleaned_data['email_response_field']:
email_text += '\n\nFurther explanations: ' + form.cleaned_data['email_response_field']
emailmessage = EmailMessage('SciPost Commentary Page activated', email_text, 'commentaries@scipost.org', [commentary.requested_by.user.email, 'commentaries@scipost.org'], reply_to=['comentaries@scipost.org'])
diff --git a/comments/views.py b/comments/views.py
index 8c2f15b32ee4a8e1c47f9301b865b520a2526e95..140d08fdf68a713220061902735e2d30eed3407b 100644
--- a/comments/views.py
+++ b/comments/views.py
@@ -37,11 +37,11 @@ def vet_submitted_comment_ack(request, comment_id):
# accept the comment as is
comment.status = 1
comment.save()
- email_text = 'Dear ' + comment.author.title + ' ' + comment.author.last_name + ', \n\n The Comment you have submitted, concerning publication with title '
+ email_text = 'Dear ' + comment.author.title + ' ' + comment.author.user.last_name + ', \n\nThe Comment you have submitted, concerning publication with title '
if comment.commentary is not None:
- email_text + comment.commentary.pub_title + ' by ' + comment.commentary.author_list
+ email_text += comment.commentary.pub_title + ' by ' + comment.commentary.author_list
elif comment.submission is not None:
- email_text + comment.submission.title + ' by ' + comment.submission.author_list
+ email_text += comment.submission.title + ' by ' + comment.submission.author_list
email_text += ', has been accepted and published online.' + '\n\nThank you for your contribution, \nThe SciPost Team.'
emailmessage = EmailMessage('SciPost Comment published', email_text, 'noreply@scipost.org', ['jscaux@gmail.com'], reply_to=['J.S.Caux@uva.nl'])
emailmessage.send(fail_silently=False)
@@ -51,9 +51,9 @@ def vet_submitted_comment_ack(request, comment_id):
comment.save()
email_text = 'The Comment you have submitted, concerning publication with title '
if comment.commentary is not None:
- email_text + comment.commentary.pub_title + ' by ' + comment.commentary.author_list
+ email_text += comment.commentary.pub_title + ' by ' + comment.commentary.author_list
elif comment.submission is not None:
- email_text + comment.submission.title + ' by ' + comment.submission.author_list
+ email_text += comment.submission.title + ' by ' + comment.submission.author_list
email_text += ', has been rejected for the following reason:' + form.cleaned_data['refusal_reason'] + '.\n\nThank you for your contribution, \nThe SciPost Team.'
if form.cleaned_data['email_response_field']:
email_text += '\n\nFurther explanations: ' + form.cleaned_data['email_response_field']
@@ -162,9 +162,9 @@ def vet_author_reply_ack(request, reply_id):
reply.save()
email_text = 'The Author Reply you have submitted, concerning publication with title '
if reply.commentary is not None:
- email_text + reply.commentary.pub_title + ' by ' + reply.commentary.author_list
+ email_text += reply.commentary.pub_title + ' by ' + reply.commentary.author_list
elif reply.submission is not None:
- email_text + reply.submission.title + ' by ' + reply.submission.author_list
+ email_text += reply.submission.title + ' by ' + reply.submission.author_list
email_text += ', has been accepted and published online.' + '\n\nThank you for your contribution, \nThe SciPost Team.'
emailmessage = EmailMessage('SciPost Author Reply published', email_text, 'noreply@scipost.org', ['jscaux@gmail.com'], reply_to=['J.S.Caux@uva.nl'])
emailmessage.send(fail_silently=False)
@@ -174,9 +174,9 @@ def vet_author_reply_ack(request, reply_id):
reply.save()
email_text = 'The Author Reply you have submitted, concerning publication with title '
if reply.commentary is not None:
- email_text + reply.commentary.pub_title + ' by ' + reply.commentary.author_list
+ email_text += reply.commentary.pub_title + ' by ' + reply.commentary.author_list
elif reply.submission is not None:
- email_text + reply.submission.title + ' by ' + reply.submission.author_list
+ email_text += reply.submission.title + ' by ' + reply.submission.author_list
email_text += ', has been rejected for the following reason:' + form.cleaned_data['refusal_reason'] + '.\n\nThank you for your contribution, \nThe SciPost Team.'
if form.cleaned_data['email_response_field']:
email_text += '\n\nFurther explanations: ' + form.cleaned_data['email_response_field']
diff --git a/ratings/views.py b/ratings/views.py
index 93327726b06aca6a3c0321048d1c2cfdf0f19ebc..0ed8e7d37dedc2dbcb6868332064a3906e01220d 100644
--- a/ratings/views.py
+++ b/ratings/views.py
@@ -14,15 +14,12 @@ from .forms import *
-
-
def vote_on_commentary(request, commentary_id):
commentary = get_object_or_404(Commentary, pk=commentary_id)
rater = Contributor.objects.get(user=request.user)
if request.method == 'POST':
form = CommentaryRatingForm(request.POST)
if form.is_valid():
-# if rater.id != report.author.id:
# Any previous rating from this contributor for this report is deleted:
CommentaryRating.objects.filter(rater=rater, commentary=commentary).delete()
newrating = CommentaryRating (
diff --git a/scipost/views.py b/scipost/views.py
index 19d46bf3235c902bb4ca8a6ae596e144f1410bbf..54fdb0be49a6bfa33e32ae6317cd1caa40235ef5 100644
--- a/scipost/views.py
+++ b/scipost/views.py
@@ -35,7 +35,6 @@ def description(request):
response = HttpResponse(content_type='application/pdf')
response['Content-Disposition'] = 'filename="SciPost_Description.pdf"'
return response
-# return HttpResponse("scipost/SciPost_Description.pdf", content_type="application/pdf")
def peer_witnessed_refereeing(request):
return render(request, 'scipost/peer_witnessed_refereeing.html')