From cc6b0e7ee7cd15eea6a4c123e2c14df46f10c6ce Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Wed, 30 Sep 2020 07:56:46 +0200
Subject: [PATCH] Move get_title_display from contributor to profile
---
.../vet_commentary_email_accepted.html | 2 +-
.../vet_commentary_email_modified.html | 2 +-
.../vet_commentary_email_rejected.html | 2 +-
comments/models.py | 2 +-
journals/utils.py | 2 +-
scipost/models.py | 2 +-
.../submissions/pool/referee_invitations.html | 2 +-
.../recommendation_fellow_content.html | 2 +-
.../submission_refereeing_history.html | 2 +-
submissions/utils.py | 46 +++++++++----------
submissions/views.py | 2 +-
.../authors/acknowledge_resubmission.html | 2 +-
.../email/authors/acknowledge_submission.html | 2 +-
.../authors/confirm_puboffer_acceptance.html | 2 +-
.../inform_authors_comment_received.html | 2 +-
..._authors_contributor_commented_report.html | 2 +-
.../inform_authors_editorial_decision.html | 2 +-
...nform_authors_eic_assigned_direct_rec.html | 2 +-
.../inform_authors_manuscript_withdrawn.html | 2 +-
.../email/authors/request_pubfrac_check.html | 2 +-
.../inform_commenter_comment_received.html | 2 +-
.../inform_commenter_comment_rejected.html | 2 +-
.../inform_commenter_comment_vetted.html | 2 +-
...contributor_duplicate_accounts_merged.html | 2 +-
templates/email/eic/assignment_request.html | 2 +-
.../eic/inform_eic_comment_received.html | 4 +-
.../eic/inform_eic_manuscript_withdrawn.html | 2 +-
.../email/eic/inform_eic_report_received.html | 4 +-
templates/email/eic/referee_response.html | 4 +-
templates/email/eic/referee_unresponsive.html | 2 +-
.../email/eic/submission_reappointment.html | 2 +-
.../email/email_comment_made_citable.html | 4 +-
.../email/email_report_made_citable.html | 2 +-
templates/email/email_report_made_citable.txt | 2 +-
.../email_fellow_assigned_submission.html | 2 +-
.../email_fellow_replaced_by_other.html | 2 +-
.../email/fellows/email_fellow_tasklist.html | 2 +-
.../email_contact_for_activation.html | 4 +-
templates/email/production_send_proofs.html | 2 +-
.../confirmation_invitation_response.html | 2 +-
...orm_referee_authors_replied_to_report.html | 2 +-
..._referee_contributor_commented_report.html | 2 +-
.../inform_referee_manuscript_withdrawn.html | 2 +-
.../inform_referee_report_received.html | 2 +-
.../invite_contributor_to_referee.html | 4 +-
...vite_contributor_to_referee_reminder1.html | 4 +-
...vite_contributor_to_referee_reminder2.html | 4 +-
.../invite_unregistered_to_referee.html | 2 +-
...ite_unregistered_to_referee_reminder1.html | 2 +-
...ite_unregistered_to_referee_reminder2.html | 2 +-
.../reinvite_contributor_to_referee.html | 2 +-
.../remind_referee_deadline_1week.html | 2 +-
.../email/submissions_assignment_failed.html | 2 +-
theses/forms.py | 2 +-
54 files changed, 84 insertions(+), 84 deletions(-)
diff --git a/commentaries/templates/commentaries/vet_commentary_email_accepted.html b/commentaries/templates/commentaries/vet_commentary_email_accepted.html
index 630b8d691..8e5814eb3 100644
--- a/commentaries/templates/commentaries/vet_commentary_email_accepted.html
+++ b/commentaries/templates/commentaries/vet_commentary_email_accepted.html
@@ -1,4 +1,4 @@
-Dear {{ commentary.requested_by.get_title_display }} {{ commentary.requested_by.user.last_name }},
+Dear {{ commentary.requested_by.profile.get_title_display }} {{ commentary.requested_by.user.last_name }},
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.
diff --git a/commentaries/templates/commentaries/vet_commentary_email_modified.html b/commentaries/templates/commentaries/vet_commentary_email_modified.html
index 908e8d6c5..e6a8cbada 100644
--- a/commentaries/templates/commentaries/vet_commentary_email_modified.html
+++ b/commentaries/templates/commentaries/vet_commentary_email_modified.html
@@ -1,4 +1,4 @@
-Dear {{ commentary.requested_by.get_title_display }} {{ commentary.requested_by.user.last_name }},
+Dear {{ commentary.requested_by.profile.get_title_display }} {{ commentary.requested_by.user.last_name }},
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.
diff --git a/commentaries/templates/commentaries/vet_commentary_email_rejected.html b/commentaries/templates/commentaries/vet_commentary_email_rejected.html
index e2bac06f2..8e9bad0ab 100644
--- a/commentaries/templates/commentaries/vet_commentary_email_rejected.html
+++ b/commentaries/templates/commentaries/vet_commentary_email_rejected.html
@@ -1,4 +1,4 @@
-Dear {{ commentary.requested_by.get_title_display }} {{ commentary.requested_by.user.last_name }},
+Dear {{ commentary.requested_by.profile.get_title_display }} {{ commentary.requested_by.user.last_name }},
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 }}.
diff --git a/comments/models.py b/comments/models.py
index 5da586da0..fb646ec83 100644
--- a/comments/models.py
+++ b/comments/models.py
@@ -166,7 +166,7 @@ class Comment(TimeStampedModel):
"""Return author string if not anonymous."""
author = self.get_author()
if author:
- return '{} {}'.format(author.get_title_display(), author.user.last_name)
+ return '{} {}'.format(author.profile.get_title_display(), author.user.last_name)
return 'Anonymous'
diff --git a/journals/utils.py b/journals/utils.py
index 5289e1a95..73d486589 100644
--- a/journals/utils.py
+++ b/journals/utils.py
@@ -15,7 +15,7 @@ class JournalUtils(BaseMailUtil):
def send_authors_paper_published_email(cls):
""" Requires loading 'publication' attribute. """
email_text = ('Dear '
- + cls.publication.accepted_submission.submitted_by.get_title_display()
+ + cls.publication.accepted_submission.submitted_by.profile.get_title_display()
+ ' ' +
cls.publication.accepted_submission.submitted_by.user.last_name +
', \n\nWe are happy to inform you that your Submission to SciPost,\n\n' +
diff --git a/scipost/models.py b/scipost/models.py
index 178ac3269..54d353a28 100644
--- a/scipost/models.py
+++ b/scipost/models.py
@@ -101,7 +101,7 @@ class Contributor(models.Model):
@property
def formal_str(self):
- return '%s %s' % (self.get_title_display(), self.user.last_name)
+ return '%s %s' % (self.profile.get_title_display(), self.user.last_name)
@property
def is_active(self):
diff --git a/submissions/templates/partials/submissions/pool/referee_invitations.html b/submissions/templates/partials/submissions/pool/referee_invitations.html
index 519e68b49..c120b79eb 100644
--- a/submissions/templates/partials/submissions/pool/referee_invitations.html
+++ b/submissions/templates/partials/submissions/pool/referee_invitations.html
@@ -30,7 +30,7 @@
<div class="badge badge-danger">overdue</div>
{% endif %}
</td>
- <td class="py-3">{{ invitation.get_title_display }} {{invitation.first_name}} {{invitation.last_name}}</td>
+ <td class="py-3">{{ invitation.get_title_display }} {{ invitation.first_name }} {{ invitation.last_name }}</td>
<td>
{{ invitation.date_invited }}
</td>
diff --git a/submissions/templates/partials/submissions/recommendation_fellow_content.html b/submissions/templates/partials/submissions/recommendation_fellow_content.html
index 51ea08398..72ae8e269 100644
--- a/submissions/templates/partials/submissions/recommendation_fellow_content.html
+++ b/submissions/templates/partials/submissions/recommendation_fellow_content.html
@@ -4,7 +4,7 @@
{% block recommendation_header %}
- <h4 class="text-muted mb-2">By {{ recommendation.submission.editor_in_charge.get_title_display }} {{ recommendation.submission.editor_in_charge.user.first_name }} {{ recommendation.submission.editor_in_charge.user.last_name }}, formulated on {{ recommendation.date_submitted }}</h4>
+ <h4 class="text-muted mb-2">By {{ recommendation.submission.editor_in_charge.profile.get_title_display }} {{ recommendation.submission.editor_in_charge.user.first_name }} {{ recommendation.submission.editor_in_charge.user.last_name }}, formulated on {{ recommendation.date_submitted }}</h4>
{% endblock %}
{% block recommendation_remarks_for_editorial_college %}
diff --git a/submissions/templates/partials/submissions/submission_refereeing_history.html b/submissions/templates/partials/submissions/submission_refereeing_history.html
index e0050aa27..bfd68ce81 100644
--- a/submissions/templates/partials/submissions/submission_refereeing_history.html
+++ b/submissions/templates/partials/submissions/submission_refereeing_history.html
@@ -16,7 +16,7 @@
</div>
<ul class="my-2 pl-4">
{% for report in sibling.reports.accepted %}
- <li><a href="{{ report.get_absolute_url }}"{% if target_blank %} target="_blank"{% endif %}>Report {{ report.report_nr }} submitted on {{ report.date_submitted }} by {% if report.anonymous %}<em>Anonymous</em>{% else %}{{ report.author.get_title_display }} {{ report.author.user.last_name }}{% endif %}</a></li>
+ <li><a href="{{ report.get_absolute_url }}"{% if target_blank %} target="_blank"{% endif %}>Report {{ report.report_nr }} submitted on {{ report.date_submitted }} by {% if report.anonymous %}<em>Anonymous</em>{% else %}{{ report.author.profile.get_title_display }} {{ report.author.user.last_name }}{% endif %}</a></li>
{% include 'partials/comments/comments_list.html' with comments=report.comments.vetted css_class='my-1 pl-4' target_blank=target_blank %}
{% endfor %}
</ul>
diff --git a/submissions/utils.py b/submissions/utils.py
index e097a806b..acc7229c9 100644
--- a/submissions/utils.py
+++ b/submissions/utils.py
@@ -21,7 +21,7 @@ class SubmissionUtils(BaseMailUtil):
@classmethod
def send_assignment_request_email(cls):
""" Requires loading 'assignment' attribute. """
- email_text = ('Dear ' + cls.assignment.to.get_title_display() + ' ' +
+ email_text = ('Dear ' + cls.assignment.to.profile.get_title_display() + ' ' +
cls.assignment.to.user.last_name +
', \n\nWe have received a Submission to SciPost ' +
'for which we would like you to consider becoming Editor-in-charge:\n\n' +
@@ -54,7 +54,7 @@ class SubmissionUtils(BaseMailUtil):
'\n<p>Many thanks in advance for your collaboration,</p>'
'<p>The SciPost Team.</p>')
email_context = {
- 'title': cls.assignment.to.get_title_display(),
+ 'title': cls.assignment.to.profile.get_title_display(),
'last_name': cls.assignment.to.user.last_name,
'sub_title': cls.assignment.submission.title,
'author_list': cls.assignment.submission.author_list,
@@ -75,7 +75,7 @@ class SubmissionUtils(BaseMailUtil):
def send_EIC_appointment_email(cls):
""" Requires loading 'assignment' attribute. """
r = cls.assignment
- email_text = ('Dear ' + cls.assignment.to.get_title_display() + ' '
+ email_text = ('Dear ' + cls.assignment.to.profile.get_title_display() + ' '
+ cls.assignment.to.user.last_name
+ ', \n\nThank you for accepting to become Editor-in-charge '
'of the SciPost Submission\n\n'
@@ -113,7 +113,7 @@ class SubmissionUtils(BaseMailUtil):
'<p>Many thanks in advance for your collaboration,</p>'
'<p>The SciPost Team.</p>')
email_context = {
- 'title': cls.assignment.to.get_title_display(),
+ 'title': cls.assignment.to.profile.get_title_display(),
'last_name': cls.assignment.to.user.last_name,
'sub_title': cls.assignment.submission.title,
'author_list': cls.assignment.submission.author_list,
@@ -134,7 +134,7 @@ class SubmissionUtils(BaseMailUtil):
@classmethod
def send_author_prescreening_passed_email(cls):
""" Requires loading 'assignment' attribute. """
- email_text = ('Dear ' + cls.assignment.submission.submitted_by.get_title_display() + ' '
+ email_text = ('Dear ' + cls.assignment.submission.submitted_by.profile.get_title_display() + ' '
+ cls.assignment.submission.submitted_by.user.last_name
+ ', \n\nWe are pleased to inform you that your recent Submission to SciPost,\n\n'
+ cls.assignment.submission.title + ' by ' + cls.assignment.submission.author_list
@@ -189,7 +189,7 @@ class SubmissionUtils(BaseMailUtil):
'<p>Sincerely,</p>'
'<p>The SciPost Team.</p>')
email_context = {
- 'title': cls.assignment.submission.submitted_by.get_title_display(),
+ 'title': cls.assignment.submission.submitted_by.profile.get_title_display(),
'last_name': cls.assignment.submission.submitted_by.user.last_name,
'sub_title': cls.assignment.submission.title,
'author_list': cls.assignment.submission.author_list,
@@ -220,7 +220,7 @@ class SubmissionUtils(BaseMailUtil):
'Dear ' + cls.invitation.get_title_display() + ' '
+ cls.invitation.last_name + ',\n\n'
'On behalf of the Editor-in-charge '
- + cls.invitation.submission.editor_in_charge.get_title_display() + ' '
+ + cls.invitation.submission.editor_in_charge.profile.get_title_display() + ' '
+ cls.invitation.submission.editor_in_charge.user.last_name
+ ', we would like to cordially remind you of our recent request to referee\n\n'
+ cls.invitation.submission.title + ' by '
@@ -295,7 +295,7 @@ class SubmissionUtils(BaseMailUtil):
email_context = {
'title': cls.invitation.get_title_display(),
'last_name': cls.invitation.last_name,
- 'EIC_title': cls.invitation.submission.editor_in_charge.get_title_display(),
+ 'EIC_title': cls.invitation.submission.editor_in_charge.profile.get_title_display(),
'EIC_last_name': cls.invitation.submission.editor_in_charge.user.last_name,
'sub_title': cls.invitation.submission.title,
'author_list': cls.invitation.submission.author_list,
@@ -328,7 +328,7 @@ class SubmissionUtils(BaseMailUtil):
'Dear ' + cls.invitation.get_title_display() + ' '
+ cls.invitation.last_name + ',\n\n'
'On behalf of the Editor-in-charge '
- + cls.invitation.submission.editor_in_charge.get_title_display() + ' '
+ + cls.invitation.submission.editor_in_charge.profile.get_title_display() + ' '
+ cls.invitation.submission.editor_in_charge.user.last_name
+ ', we would like to cordially remind you of our recent request to referee\n\n'
+ cls.invitation.submission.title + ' by '
@@ -381,7 +381,7 @@ class SubmissionUtils(BaseMailUtil):
email_context = {
'title': cls.invitation.get_title_display(),
'last_name': cls.invitation.last_name,
- 'EIC_title': cls.invitation.submission.editor_in_charge.get_title_display(),
+ 'EIC_title': cls.invitation.submission.editor_in_charge.profile.get_title_display(),
'EIC_last_name': cls.invitation.submission.editor_in_charge.user.last_name,
'sub_title': cls.invitation.submission.title,
'author_list': cls.invitation.submission.author_list,
@@ -412,7 +412,7 @@ class SubmissionUtils(BaseMailUtil):
email_text = ('Dear ' + cls.invitation.get_title_display() + ' '
+ cls.invitation.last_name + ',\n\n'
'On behalf of the Editor-in-charge '
- + cls.invitation.submission.editor_in_charge.get_title_display() + ' '
+ + cls.invitation.submission.editor_in_charge.profile.get_title_display() + ' '
+ cls.invitation.submission.editor_in_charge.user.last_name
+ ', we would like to inform you that your report on\n\n'
+ cls.invitation.submission.title + ' by '
@@ -452,7 +452,7 @@ class SubmissionUtils(BaseMailUtil):
email_context = {
'title': cls.invitation.get_title_display(),
'last_name': cls.invitation.last_name,
- 'EIC_title': cls.invitation.submission.editor_in_charge.get_title_display(),
+ 'EIC_title': cls.invitation.submission.editor_in_charge.profile.get_title_display(),
'EIC_last_name': cls.invitation.submission.editor_in_charge.user.last_name,
'sub_title': cls.invitation.submission.title,
'author_list': cls.invitation.submission.author_list,
@@ -474,7 +474,7 @@ class SubmissionUtils(BaseMailUtil):
@classmethod
def acknowledge_report_email(cls):
""" Requires loading 'report' attribute. """
- email_text = ('Dear ' + cls.report.author.get_title_display() + ' ' +
+ email_text = ('Dear ' + cls.report.author.profile.get_title_display() + ' ' +
cls.report.author.user.last_name + ','
'\n\nMany thanks for your Report on Submission\n\n' +
cls.report.submission.title + ' by '
@@ -527,7 +527,7 @@ class SubmissionUtils(BaseMailUtil):
'\n<strong>Requested changes</strong>: <br/><p>{{ requested_changes|linebreaks }}</p>'
'\n<strong>Remarks for Editors</strong>: <br/><p>{{ remarks_for_editors|linebreaks }}</p>')
email_context = {
- 'ref_title': cls.report.author.get_title_display(),
+ 'ref_title': cls.report.author.profile.get_title_display(),
'ref_last_name': cls.report.author.user.last_name,
'sub_title': cls.report.submission.title,
'author_list': cls.report.submission.author_list,
@@ -557,7 +557,7 @@ class SubmissionUtils(BaseMailUtil):
@classmethod
def send_author_report_received_email(cls):
""" Requires loading 'report' attribute. """
- email_text = ('Dear ' + cls.report.submission.submitted_by.get_title_display() + ' ' +
+ email_text = ('Dear ' + cls.report.submission.submitted_by.profile.get_title_display() + ' ' +
cls.report.submission.submitted_by.user.last_name +
', \n\nA Report has been posted on your recent Submission to SciPost,\n\n' +
cls.report.submission.title + ' by ' + cls.report.submission.author_list + '.'
@@ -588,7 +588,7 @@ class SubmissionUtils(BaseMailUtil):
'<p>Sincerely,</p>'
'<p>The SciPost Team.</p>')
email_context = {
- 'auth_title': cls.report.submission.submitted_by.get_title_display(),
+ 'auth_title': cls.report.submission.submitted_by.profile.get_title_display(),
'auth_last_name': cls.report.submission.submitted_by.user.last_name,
'sub_title': cls.report.submission.title,
'author_list': cls.report.submission.author_list,
@@ -620,7 +620,7 @@ class SubmissionUtils(BaseMailUtil):
if cls.communication.comtype in ['AtoE', 'RtoE', 'StoE']:
recipient_email.append(cls.communication.submission.editor_in_charge.user.email)
recipient_greeting = ('Dear ' +
- cls.communication.submission.editor_in_charge.get_title_display() + ' ' +
+ cls.communication.submission.editor_in_charge.profile.get_title_display() + ' ' +
cls.communication.submission.editor_in_charge.user.last_name)
further_action_page = ('https://scipost.org/submission/editorial_page/'
+ cls.communication.submission.preprint.identifier_w_vn_nr)
@@ -630,14 +630,14 @@ class SubmissionUtils(BaseMailUtil):
elif cls.communication.comtype in ['EtoA']:
recipient_email.append(cls.communication.submission.submitted_by.user.email)
recipient_greeting = ('Dear ' +
- cls.communication.submission.submitted_by.get_title_display() + ' ' +
+ cls.communication.submission.submitted_by.profile.get_title_display() + ' ' +
cls.communication.submission.submitted_by.user.last_name)
bcc_emails.append(cls.communication.submission.editor_in_charge.user.email)
bcc_emails.append('submissions@scipost.org')
elif cls.communication.comtype in ['EtoR']:
recipient_email.append(cls.communication.referee.user.email)
recipient_greeting = ('Dear ' +
- cls.communication.referee.get_title_display() + ' ' +
+ cls.communication.referee.profile.get_title_display() + ' ' +
cls.communication.referee.user.last_name)
bcc_emails.append(cls.communication.submission.editor_in_charge.user.email)
bcc_emails.append('submissions@scipost.org')
@@ -672,7 +672,7 @@ class SubmissionUtils(BaseMailUtil):
@classmethod
def send_author_revision_requested_email(cls):
""" Requires loading 'submission' and 'recommendation' attributes. """
- email_text = ('Dear ' + cls.submission.submitted_by.get_title_display() + ' ' +
+ email_text = ('Dear ' + cls.submission.submitted_by.profile.get_title_display() + ' ' +
cls.submission.submitted_by.user.last_name +
', \n\nThe Editor-in-charge of your recent Submission to SciPost,\n\n' +
cls.submission.title + ' by ' + cls.submission.author_list + ','
@@ -719,7 +719,7 @@ class SubmissionUtils(BaseMailUtil):
'<p>Sincerely,</p>'
'<p>The SciPost Team.</p>')
email_context = {
- 'auth_title': cls.submission.submitted_by.get_title_display(),
+ 'auth_title': cls.submission.submitted_by.profile.get_title_display(),
'auth_last_name': cls.submission.submitted_by.user.last_name,
'sub_title': cls.submission.title,
'author_list': cls.submission.author_list,
@@ -741,7 +741,7 @@ class SubmissionUtils(BaseMailUtil):
@classmethod
def send_author_College_decision_email(cls):
""" Requires loading 'submission' and 'recommendation' attributes. """
- email_text = ('Dear ' + cls.submission.submitted_by.get_title_display() + ' ' +
+ email_text = ('Dear ' + cls.submission.submitted_by.profile.get_title_display() + ' ' +
cls.submission.submitted_by.user.last_name +
', \n\nThe Editorial College of SciPost has taken a decision '
'regarding your recent Submission,\n\n' +
@@ -808,7 +808,7 @@ class SubmissionUtils(BaseMailUtil):
'<p>Sincerely,</p>'
'<p>The SciPost Team.</p>')
email_context = {
- 'auth_title': cls.submission.submitted_by.get_title_display(),
+ 'auth_title': cls.submission.submitted_by.profile.get_title_display(),
'auth_last_name': cls.submission.submitted_by.user.last_name,
'sub_title': cls.submission.title,
'author_list': cls.submission.author_list,
diff --git a/submissions/views.py b/submissions/views.py
index fb0689332..29bf3589d 100644
--- a/submissions/views.py
+++ b/submissions/views.py
@@ -786,7 +786,7 @@ def editorial_assignment(request, identifier_w_vn_nr, assignment_id=None):
if submission.editor_in_charge:
messages.success(
request, '{} {} has already agreed to be Editor-in-charge of this Submission.'.format(
- submission.editor_in_charge.get_title_display(),
+ submission.editor_in_charge.profile.get_title_display(),
submission.editor_in_charge.user.last_name))
return redirect('submissions:pool')
elif submission.status == STATUS_ASSIGNMENT_FAILED:
diff --git a/templates/email/authors/acknowledge_resubmission.html b/templates/email/authors/acknowledge_resubmission.html
index ad17676ee..56cfe1721 100644
--- a/templates/email/authors/acknowledge_resubmission.html
+++ b/templates/email/authors/acknowledge_resubmission.html
@@ -1,4 +1,4 @@
-<p>Dear {{ submission.submitted_by.get_title_display }} {{ submission.submitted_by.user.last_name }},</p>
+<p>Dear {{ submission.submitted_by.profile.get_title_display }} {{ submission.submitted_by.user.last_name }},</p>
<p>
We have received your Resubmission to SciPost
<br><br>
diff --git a/templates/email/authors/acknowledge_submission.html b/templates/email/authors/acknowledge_submission.html
index 8a4e2bb3f..065a74dc3 100644
--- a/templates/email/authors/acknowledge_submission.html
+++ b/templates/email/authors/acknowledge_submission.html
@@ -1,4 +1,4 @@
-<p>Dear {{ submission.submitted_by.get_title_display }} {{ submission.submitted_by.user.last_name }},</p>
+<p>Dear {{ submission.submitted_by.profile.get_title_display }} {{ submission.submitted_by.user.last_name }},</p>
<p>
We have received your Submission to SciPost
<br><br>
diff --git a/templates/email/authors/confirm_puboffer_acceptance.html b/templates/email/authors/confirm_puboffer_acceptance.html
index 1b6a19913..fcb4b4532 100644
--- a/templates/email/authors/confirm_puboffer_acceptance.html
+++ b/templates/email/authors/confirm_puboffer_acceptance.html
@@ -1,5 +1,5 @@
<p>
- Dear {{ submission.submitted_by.get_title_display }} {{ submission.submitted_by.user.last_name }},
+ Dear {{ submission.submitted_by.profile.get_title_display }} {{ submission.submitted_by.user.last_name }},
</p>
<p>
We hereby confirm your acceptance of our publication offer of your Submission
diff --git a/templates/email/authors/inform_authors_comment_received.html b/templates/email/authors/inform_authors_comment_received.html
index 4c833668c..0272dd015 100644
--- a/templates/email/authors/inform_authors_comment_received.html
+++ b/templates/email/authors/inform_authors_comment_received.html
@@ -1,5 +1,5 @@
<p>
- Dear {{ submission.submitted_by.get_title_display }} {{ submission.submitted_by.user.last_name }},
+ Dear {{ submission.submitted_by.profile.get_title_display }} {{ submission.submitted_by.user.last_name }},
</p>
<p>
We would like to inform you that a Comment has been posted on your recent Submission
diff --git a/templates/email/authors/inform_authors_contributor_commented_report.html b/templates/email/authors/inform_authors_contributor_commented_report.html
index 6859a8a9d..c8cfe615d 100644
--- a/templates/email/authors/inform_authors_contributor_commented_report.html
+++ b/templates/email/authors/inform_authors_contributor_commented_report.html
@@ -1,5 +1,5 @@
<p>
- Dear {{ report.submission.submitted_by.get_title_display }} {{ report.submission.submitted_by.user.last_name }},
+ Dear {{ report.submission.submitted_by.profile.get_title_display }} {{ report.submission.submitted_by.user.last_name }},
</p>
<p>
For your information, a Contributor Comment has been posted on a recent Report on your Submission
diff --git a/templates/email/authors/inform_authors_editorial_decision.html b/templates/email/authors/inform_authors_editorial_decision.html
index a28072d69..1cdd11c4f 100644
--- a/templates/email/authors/inform_authors_editorial_decision.html
+++ b/templates/email/authors/inform_authors_editorial_decision.html
@@ -1,6 +1,6 @@
{% load automarkup %}
<p>
- Dear {{ decision.submission.submitted_by.get_title_display }} {{ decision.submission.submitted_by.user.last_name }},
+ Dear {{ decision.submission.submitted_by.profile.get_title_display }} {{ decision.submission.submitted_by.user.last_name }},
</p>
<p>
The Editorial College of SciPost has come to a decision regarding your Submission
diff --git a/templates/email/authors/inform_authors_eic_assigned_direct_rec.html b/templates/email/authors/inform_authors_eic_assigned_direct_rec.html
index 378780963..8edaa0ab3 100644
--- a/templates/email/authors/inform_authors_eic_assigned_direct_rec.html
+++ b/templates/email/authors/inform_authors_eic_assigned_direct_rec.html
@@ -1,5 +1,5 @@
<p>
- Dear {{ assignment.submission.submitted_by.get_title_display }} {{ assignment.submission.submitted_by.user.last_name }},
+ Dear {{ assignment.submission.submitted_by.profile.get_title_display }} {{ assignment.submission.submitted_by.user.last_name }},
</p>
<p>
For your information, your Submission
diff --git a/templates/email/authors/inform_authors_manuscript_withdrawn.html b/templates/email/authors/inform_authors_manuscript_withdrawn.html
index 641084448..cf9d4de40 100644
--- a/templates/email/authors/inform_authors_manuscript_withdrawn.html
+++ b/templates/email/authors/inform_authors_manuscript_withdrawn.html
@@ -1,5 +1,5 @@
<p>
- Dear {{ submission.submitted_by.get_title_display }} {{ submission.submitted_by.user.last_name }},
+ Dear {{ submission.submitted_by.profile.get_title_display }} {{ submission.submitted_by.user.last_name }},
</p>
<p>
We hereby acknowledge withdrawal of your recent SciPost submission,
diff --git a/templates/email/authors/request_pubfrac_check.html b/templates/email/authors/request_pubfrac_check.html
index ecd83f640..37c4bb79a 100644
--- a/templates/email/authors/request_pubfrac_check.html
+++ b/templates/email/authors/request_pubfrac_check.html
@@ -1,5 +1,5 @@
<p>
- Dear {{ publication.accepted_submission.submitted_by.get_title_display }} {{ publication.accepted_submission.submitted_by.user.last_name }},
+ Dear {{ publication.accepted_submission.submitted_by.profile.get_title_display }} {{ publication.accepted_submission.submitted_by.user.last_name }},
</p>
<p>
For your recent SciPost publication,
diff --git a/templates/email/commenters/inform_commenter_comment_received.html b/templates/email/commenters/inform_commenter_comment_received.html
index b94e9c6ea..9592c2898 100644
--- a/templates/email/commenters/inform_commenter_comment_received.html
+++ b/templates/email/commenters/inform_commenter_comment_received.html
@@ -1,6 +1,6 @@
{% load automarkup %}
-<p>Dear {{ comment.author.get_title_display }} {{ comment.author.user.last_name }},</p>
+<p>Dear {{ comment.author.profile.get_title_display }} {{ comment.author.user.last_name }},</p>
<p>
We hereby confirm reception of your {% if comment.is_author_reply %}Author Reply{% else %}Comment{% endif %}, concerning
<br/>
diff --git a/templates/email/commenters/inform_commenter_comment_rejected.html b/templates/email/commenters/inform_commenter_comment_rejected.html
index 8590ac57b..e97476e2b 100644
--- a/templates/email/commenters/inform_commenter_comment_rejected.html
+++ b/templates/email/commenters/inform_commenter_comment_rejected.html
@@ -1,6 +1,6 @@
{% load automarkup %}
-<p>Dear {{ comment.author.get_title_display }} {{ comment.author.user.last_name }},</p>
+<p>Dear {{ comment.author.profile.get_title_display }} {{ comment.author.user.last_name }},</p>
<p>
The {% if comment.is_author_reply %}Author Reply{% else %}Comment{% endif %} you have submitted, concerning
<br/>
diff --git a/templates/email/commenters/inform_commenter_comment_vetted.html b/templates/email/commenters/inform_commenter_comment_vetted.html
index 594dd4889..bc9393592 100644
--- a/templates/email/commenters/inform_commenter_comment_vetted.html
+++ b/templates/email/commenters/inform_commenter_comment_vetted.html
@@ -1,6 +1,6 @@
{% load automarkup %}
-<p>Dear {{ comment.author.get_title_display }} {{ comment.author.user.last_name }},</p>
+<p>Dear {{ comment.author.profile.get_title_display }} {{ comment.author.user.last_name }},</p>
<p>
The {% if comment.is_author_reply %}Author Reply{% else %}Comment{% endif %} you have submitted, concerning
diff --git a/templates/email/contributors/inform_contributor_duplicate_accounts_merged.html b/templates/email/contributors/inform_contributor_duplicate_accounts_merged.html
index c7910ddd0..89b8d7c54 100644
--- a/templates/email/contributors/inform_contributor_duplicate_accounts_merged.html
+++ b/templates/email/contributors/inform_contributor_duplicate_accounts_merged.html
@@ -1,5 +1,5 @@
<p>
- Dear {{ object.duplicate_of.get_title_display }} {{ object.duplicate_of.user.last_name }},
+ Dear {{ object.duplicate_of.profile.get_title_display }} {{ object.duplicate_of.user.last_name }},
</p>
<p>
We noticed that you had two separate registrations at SciPost, and have consolidated your two accounts into a single active one, namely your account with username <strong><em style="color: green;">{{ object.duplicate_of.user.username }}</em></strong>.
diff --git a/templates/email/eic/assignment_request.html b/templates/email/eic/assignment_request.html
index c37be4b33..1f2467296 100644
--- a/templates/email/eic/assignment_request.html
+++ b/templates/email/eic/assignment_request.html
@@ -1,5 +1,5 @@
<p>
- Dear {{ object.to.get_title_display }} {{ object.to.user.last_name }},
+ Dear {{ object.to.profile.get_title_display }} {{ object.to.user.last_name }},
</p>
<p>
We have received a Submission to SciPost for which we would like you to consider becoming Editor-in-charge:
diff --git a/templates/email/eic/inform_eic_comment_received.html b/templates/email/eic/inform_eic_comment_received.html
index d326b0199..940d843fc 100644
--- a/templates/email/eic/inform_eic_comment_received.html
+++ b/templates/email/eic/inform_eic_comment_received.html
@@ -1,7 +1,7 @@
-<p>Dear {{ comment.core_content_object.editor_in_charge.get_title_display }} {{ comment.core_content_object.editor_in_charge.user.last_name }},</p>
+<p>Dear {{ comment.core_content_object.editor_in_charge.profile.get_title_display }} {{ comment.core_content_object.editor_in_charge.user.last_name }},</p>
<p>
- {{ comment.author.get_title_display }} {{ comment.author.user.last_name }} has delivered a Comment for Submission:
+ {{ comment.author.profile.get_title_display }} {{ comment.author.user.last_name }} has delivered a Comment for Submission:
</p>
<p>
{{ comment.core_content_object.title }}
diff --git a/templates/email/eic/inform_eic_manuscript_withdrawn.html b/templates/email/eic/inform_eic_manuscript_withdrawn.html
index f601baf85..6d3711ef5 100644
--- a/templates/email/eic/inform_eic_manuscript_withdrawn.html
+++ b/templates/email/eic/inform_eic_manuscript_withdrawn.html
@@ -1,4 +1,4 @@
-<p>Dear {{ submission.editor_in_charge.get_title_display }} {{ submission.editor_in_charge.user.last_name }},</p>
+<p>Dear {{ submission.editor_in_charge.profile.get_title_display }} {{ submission.editor_in_charge.user.last_name }},</p>
<p>
For your information, the authors of Submission
diff --git a/templates/email/eic/inform_eic_report_received.html b/templates/email/eic/inform_eic_report_received.html
index 3710e9af7..dd5cd56c5 100644
--- a/templates/email/eic/inform_eic_report_received.html
+++ b/templates/email/eic/inform_eic_report_received.html
@@ -1,7 +1,7 @@
-<p>Dear {{ report.submission.editor_in_charge.get_title_display }} {{ report.submission.editor_in_charge.user.last_name }},</p>
+<p>Dear {{ report.submission.editor_in_charge.profile.get_title_display }} {{ report.submission.editor_in_charge.user.last_name }},</p>
<p>
- Referee {{ report.author.get_title_display }} {{ report.author.user.last_name }} has delivered a Report for Submission:
+ Referee {{ report.author.profile.get_title_display }} {{ report.author.user.last_name }} has delivered a Report for Submission:
</p>
<p>
{{ report.submission.title }}
diff --git a/templates/email/eic/referee_response.html b/templates/email/eic/referee_response.html
index 7a7b7782a..653fe8ec4 100644
--- a/templates/email/eic/referee_response.html
+++ b/templates/email/eic/referee_response.html
@@ -1,7 +1,7 @@
-<p>Dear {{ invitation.submission.editor_in_charge.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }},</p>
+<p>Dear {{ invitation.submission.editor_in_charge.profile.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }},</p>
<p>
- Referee {% if invitation.referee %}{{ invitation.referee.get_title_display }} {{ invitation.referee.user.last_name }}{% else %}{{ invitation.get_title_display }} {{ invitation.first_name }} {{ invitation.last_name }}{% endif %} has {% if invitation.accepted %}accepted{% else %}declined (due to reason: {{ invitation.get_refusal_reason_display }}){% endif %} to referee Submission
+ Referee {% if invitation.referee %}{{ invitation.referee.profile.get_title_display }} {{ invitation.referee.user.last_name }}{% else %}{{ invitation.get_title_display }} {{ invitation.first_name }} {{ invitation.last_name }}{% endif %} has {% if invitation.accepted %}accepted{% else %}declined (due to reason: {{ invitation.get_refusal_reason_display }}){% endif %} to referee Submission
</p>
<p>
{{ invitation.submission.title }}
diff --git a/templates/email/eic/referee_unresponsive.html b/templates/email/eic/referee_unresponsive.html
index 499b9722b..89c905eec 100644
--- a/templates/email/eic/referee_unresponsive.html
+++ b/templates/email/eic/referee_unresponsive.html
@@ -1,5 +1,5 @@
<p>
- Dear {{ invitation.submission.editor_in_charge.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }},
+ Dear {{ invitation.submission.editor_in_charge.profile.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }},
</p>
<p>
Referee {{ invitation.get_title_display }} {{ invitation.last_name }}, whom you invited to referee
diff --git a/templates/email/eic/submission_reappointment.html b/templates/email/eic/submission_reappointment.html
index 1107435d7..7595e5b57 100644
--- a/templates/email/eic/submission_reappointment.html
+++ b/templates/email/eic/submission_reappointment.html
@@ -1,4 +1,4 @@
-<p>Dear {{ submission.editor_in_charge.get_title_display }} {{ submission.editor_in_charge.user.last_name }},</p>
+<p>Dear {{ submission.editor_in_charge.profile.get_title_display }} {{ submission.editor_in_charge.user.last_name }},</p>
<p>
The authors of the SciPost Submission
diff --git a/templates/email/email_comment_made_citable.html b/templates/email/email_comment_made_citable.html
index eeae17f15..5d84301c8 100644
--- a/templates/email/email_comment_made_citable.html
+++ b/templates/email/email_comment_made_citable.html
@@ -1,9 +1,9 @@
-<p>Dear {{ comment.author.get_title_display }} {{ comment.author.user.last_name }},</p>
+<p>Dear {{ comment.author.profile.get_title_display }} {{ comment.author.user.last_name }},</p>
<p>
The Comment you have submitted, concerning publication with title
- {{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>)
+ {{ 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 ascribed DOI <a href="//doi.org/{{ comment.doi_string }}">{{ comment.doi_string }}</a> (https://doi.org/{{ comment.doi_string }}), and is thus now citable in the form:
</p>
<p>
diff --git a/templates/email/email_report_made_citable.html b/templates/email/email_report_made_citable.html
index 1c871e5d6..ca9b25971 100644
--- a/templates/email/email_report_made_citable.html
+++ b/templates/email/email_report_made_citable.html
@@ -1,4 +1,4 @@
-<p>Dear {{ report.author.get_title_display }} {{ report.author.user.last_name }},</p>
+<p>Dear {{ report.author.profile.get_title_display }} {{ report.author.user.last_name }},</p>
<p>
Your Report on Submission:
diff --git a/templates/email/email_report_made_citable.txt b/templates/email/email_report_made_citable.txt
index a09663eeb..a6c85f854 100644
--- a/templates/email/email_report_made_citable.txt
+++ b/templates/email/email_report_made_citable.txt
@@ -1,4 +1,4 @@
-Dear {{ report.author.get_title_display }} {{ report.author.user.last_name }},
+Dear {{ report.author.profile.get_title_display }} {{ report.author.user.last_name }},
Your Report on Submission:
diff --git a/templates/email/fellows/email_fellow_assigned_submission.html b/templates/email/fellows/email_fellow_assigned_submission.html
index 71b4f6ddc..d57d281f0 100644
--- a/templates/email/fellows/email_fellow_assigned_submission.html
+++ b/templates/email/fellows/email_fellow_assigned_submission.html
@@ -1,4 +1,4 @@
-Dear {{ assignment.to.get_title_display }} {{ assignment.to.user.last_name }},
+Dear {{ assignment.to.profile.get_title_display }} {{ assignment.to.user.last_name }},
Thank you for accepting to become Editor-in-charge of the SciPost Submission
diff --git a/templates/email/fellows/email_fellow_replaced_by_other.html b/templates/email/fellows/email_fellow_replaced_by_other.html
index 92f1e04c6..7ca463e87 100644
--- a/templates/email/fellows/email_fellow_replaced_by_other.html
+++ b/templates/email/fellows/email_fellow_replaced_by_other.html
@@ -1,4 +1,4 @@
-Dear {{ assignment.to.get_title_display }} {{ assignment.to.user.last_name }},
+Dear {{ assignment.to.profile.get_title_display }} {{ assignment.to.user.last_name }},
We have deprecated your assignment as Editor-in-charge of Submission
diff --git a/templates/email/fellows/email_fellow_tasklist.html b/templates/email/fellows/email_fellow_tasklist.html
index 6b10719dd..e31fe3710 100644
--- a/templates/email/fellows/email_fellow_tasklist.html
+++ b/templates/email/fellows/email_fellow_tasklist.html
@@ -1,4 +1,4 @@
-<p>Dear {{ fellow.get_title_display }} {{ fellow.user.last_name }},</p>
+<p>Dear {{ fellow.profile.get_title_display }} {{ fellow.user.last_name }},</p>
<p>Please find below a summary of your current assignments, with (if applicable) pending and upcoming required actions. Many thanks in advance for your timely intervention on any point in need of attention. Your good work as an Editorial Fellow is greatly appreciated!</p>
diff --git a/templates/email/org_contacts/email_contact_for_activation.html b/templates/email/org_contacts/email_contact_for_activation.html
index 3c22cb2ba..d7f37d8fb 100644
--- a/templates/email/org_contacts/email_contact_for_activation.html
+++ b/templates/email/org_contacts/email_contact_for_activation.html
@@ -1,10 +1,10 @@
-<p>Dear {{contact.get_title_display}} {{contact.user.last_name}},</p>
+<p>Dear {{ contact.get_title_display }} {{ contact.user.last_name }},</p>
<p>
Many thanks for sponsoring SciPost. We have now created a personal account for you on scipost.org, which will allow you to access all relevant information and functionalities related to sponsoring.
</p>
<p>
- In order to activate your account, please navigate to <a href="https://scipost.org{% url 'organizations:activate_account' contact.activation_key %}?email={{contact.user.email}}">this link</a>. You will be asked to choose a password, after which you will be able to login (your username being defined as your email address).
+ In order to activate your account, please navigate to <a href="https://scipost.org{% url 'organizations:activate_account' contact.activation_key %}?email={{ contact.user.email }}">this link</a>. You will be asked to choose a password, after which you will be able to login (your username being defined as your email address).
</p>
<p>
After logging in, you will find a “Org dashboard†link in the top menu, which will take you to your info page, where you will find further links for managing your account and the associated data (in particular, the public visibility settings of your sponsorship amounts and associated documents).
diff --git a/templates/email/production_send_proofs.html b/templates/email/production_send_proofs.html
index 2474e4b62..a6c1c084b 100644
--- a/templates/email/production_send_proofs.html
+++ b/templates/email/production_send_proofs.html
@@ -1,5 +1,5 @@
<p>
- Dear {% for author in proofs.stream.submission.authors.all %}{{ author.get_title_display }} {{ author.user.last_name }}{% if not forloop.last %}, {% elif proofs.stream.submission.authors.count > 1 %} and {% endif %}{% endfor %},
+ Dear {% for author in proofs.stream.submission.authors.all %}{{ author.profile.get_title_display }} {{ author.user.last_name }}{% if not forloop.last %}, {% elif proofs.stream.submission.authors.count > 1 %} and {% endif %}{% endfor %},
</p>
<p>
diff --git a/templates/email/referees/confirmation_invitation_response.html b/templates/email/referees/confirmation_invitation_response.html
index 5194156e5..d8183c155 100644
--- a/templates/email/referees/confirmation_invitation_response.html
+++ b/templates/email/referees/confirmation_invitation_response.html
@@ -1,4 +1,4 @@
-<p>Dear {{ invitation.referee.get_title_display }} {{ invitation.referee.user.last_name }},</p>
+<p>Dear {{ invitation.referee.profile.get_title_display }} {{ invitation.referee.user.last_name }},</p>
<p>
We hereby confirm your choice to {% if invitation.accepted %}accept{% else %}decline (due to reason: {{ invitation.get_refusal_reason_display }}){% endif %} to referee Submission
diff --git a/templates/email/referees/inform_referee_authors_replied_to_report.html b/templates/email/referees/inform_referee_authors_replied_to_report.html
index 089c8afa4..f851931e2 100644
--- a/templates/email/referees/inform_referee_authors_replied_to_report.html
+++ b/templates/email/referees/inform_referee_authors_replied_to_report.html
@@ -1,5 +1,5 @@
<p>
- Dear {{ report.author.get_title_display }} {{ report.author.user.last_name }},
+ Dear {{ report.author.profile.get_title_display }} {{ report.author.user.last_name }},
</p>
<p>
For your information, an Author Reply has been posted on your recent Report on
diff --git a/templates/email/referees/inform_referee_contributor_commented_report.html b/templates/email/referees/inform_referee_contributor_commented_report.html
index 71c327038..518f9efd5 100644
--- a/templates/email/referees/inform_referee_contributor_commented_report.html
+++ b/templates/email/referees/inform_referee_contributor_commented_report.html
@@ -1,5 +1,5 @@
<p>
- Dear {{ report.author.get_title_display }} {{ report.author.user.last_name }},
+ Dear {{ report.author.profile.get_title_display }} {{ report.author.user.last_name }},
</p>
<p>
For your information, a Contributor Comment has been posted on your recent Report on
diff --git a/templates/email/referees/inform_referee_manuscript_withdrawn.html b/templates/email/referees/inform_referee_manuscript_withdrawn.html
index a88db6f1e..c0bb6f651 100644
--- a/templates/email/referees/inform_referee_manuscript_withdrawn.html
+++ b/templates/email/referees/inform_referee_manuscript_withdrawn.html
@@ -1,5 +1,5 @@
<p>
- Dear {{ invitation.referee.get_title_display }} {{ invitation.referee.user.last_name }},
+ Dear {{ invitation.referee.profile.get_title_display }} {{ invitation.referee.user.last_name }},
</p>
<p>
This is a simple email to inform you that the authors of
diff --git a/templates/email/referees/inform_referee_report_received.html b/templates/email/referees/inform_referee_report_received.html
index 420253b29..07b2e3e69 100644
--- a/templates/email/referees/inform_referee_report_received.html
+++ b/templates/email/referees/inform_referee_report_received.html
@@ -1,5 +1,5 @@
<p>
- Dear {{ report.author.get_title_display }} {{ report.author.user.last_name }},
+ Dear {{ report.author.profile.get_title_display }} {{ report.author.user.last_name }},
</p>
<p>We hereby confirm reception of your Report on Submission</p>
diff --git a/templates/email/referees/invite_contributor_to_referee.html b/templates/email/referees/invite_contributor_to_referee.html
index a6cafd69f..87191c20c 100644
--- a/templates/email/referees/invite_contributor_to_referee.html
+++ b/templates/email/referees/invite_contributor_to_referee.html
@@ -1,8 +1,8 @@
<p>
- Dear {{ invitation.referee.get_title_display }} {{ invitation.referee.user.last_name }},
+ Dear {{ invitation.referee.profile.get_title_display }} {{ invitation.referee.user.last_name }},
</p>
<p>
- We have received a Submission to SciPost which, in view of your expertise and on behalf of the Editor-in-charge {{ invitation.submission.editor_in_charge.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, we would like to invite you to referee:
+ We have received a Submission to SciPost which, in view of your expertise and on behalf of the Editor-in-charge {{ invitation.submission.editor_in_charge.profile.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, we would like to invite you to referee:
<br><br>
{{ invitation.submission.title }}
<br>by {{ invitation.submission.author_list }}<br>
diff --git a/templates/email/referees/invite_contributor_to_referee_reminder1.html b/templates/email/referees/invite_contributor_to_referee_reminder1.html
index a1c0ebed3..8e56cc9b8 100644
--- a/templates/email/referees/invite_contributor_to_referee_reminder1.html
+++ b/templates/email/referees/invite_contributor_to_referee_reminder1.html
@@ -1,9 +1,9 @@
<h3>Re: refereeing invitation. First automatic reminder</h3>
<p>
- Dear {{ invitation.referee.get_title_display }} {{ invitation.referee.user.last_name }},
+ Dear {{ invitation.referee.profile.get_title_display }} {{ invitation.referee.user.last_name }},
</p>
<p>
- Recently, on behalf of the Editor-in-charge {{ invitation.submission.editor_in_charge.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, we invited you to consider refereeing a Submission to {{ invitation.submission.submitted_to }}, namely<br><br>
+ Recently, on behalf of the Editor-in-charge {{ invitation.submission.editor_in_charge.profile.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, we invited you to consider refereeing a Submission to {{ invitation.submission.submitted_to }}, namely<br><br>
{{ invitation.submission.title }}<br>
by {{ invitation.submission.author_list }}<br>
(see https://scipost.org{{ invitation.submission.get_absolute_url }} - first submitted {{ invitation.submission.original_submission_date|date:"d M Y" }}).
diff --git a/templates/email/referees/invite_contributor_to_referee_reminder2.html b/templates/email/referees/invite_contributor_to_referee_reminder2.html
index d6b656ecf..96947dbe3 100644
--- a/templates/email/referees/invite_contributor_to_referee_reminder2.html
+++ b/templates/email/referees/invite_contributor_to_referee_reminder2.html
@@ -1,9 +1,9 @@
<h3>Re: refereeing invitation. Second (and last) automatic reminder</h3>
<p>
- Dear {{ invitation.referee.get_title_display }} {{ invitation.referee.user.last_name }},
+ Dear {{ invitation.referee.profile.get_title_display }} {{ invitation.referee.user.last_name }},
</p>
<p>
- Recently, on behalf of the Editor-in-charge {{ invitation.submission.editor_in_charge.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, we invited you to consider refereeing a Submission to {{ invitation.submission.submitted_to }}, namely<br><br>
+ Recently, on behalf of the Editor-in-charge {{ invitation.submission.editor_in_charge.profile.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, we invited you to consider refereeing a Submission to {{ invitation.submission.submitted_to }}, namely<br><br>
{{ invitation.submission.title }}<br>
by {{ invitation.submission.author_list }}<br>
(see https://scipost.org{{ invitation.submission.get_absolute_url }} - first submitted {{ invitation.submission.original_submission_date|date:"d M Y" }}).
diff --git a/templates/email/referees/invite_unregistered_to_referee.html b/templates/email/referees/invite_unregistered_to_referee.html
index 2f5c4fbc7..524d3c4f3 100644
--- a/templates/email/referees/invite_unregistered_to_referee.html
+++ b/templates/email/referees/invite_unregistered_to_referee.html
@@ -2,7 +2,7 @@
Dear {{ invitation.get_title_display }} {{ invitation.last_name }},
</p>
<p>
- On behalf of the Editor-in-charge {{ invitation.submission.editor_in_charge.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, we would like to invite you to referee a Submission to {{ invitation.submission.submitted_to }}, namely<br><br>
+ On behalf of the Editor-in-charge {{ invitation.submission.editor_in_charge.profile.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, we would like to invite you to referee a Submission to {{ invitation.submission.submitted_to }}, namely<br><br>
{{ invitation.submission.title }}<br>
by {{ invitation.submission.author_list }}<br>
(see https://scipost.org{{ invitation.submission.get_absolute_url }} - first submitted {{ invitation.submission.original_submission_date|date:"d M Y" }}).
diff --git a/templates/email/referees/invite_unregistered_to_referee_reminder1.html b/templates/email/referees/invite_unregistered_to_referee_reminder1.html
index 021fe3fab..81aa6cbbf 100644
--- a/templates/email/referees/invite_unregistered_to_referee_reminder1.html
+++ b/templates/email/referees/invite_unregistered_to_referee_reminder1.html
@@ -3,7 +3,7 @@
Dear {{ invitation.get_title_display }} {{ invitation.last_name }},
</p>
<p>
- Recently, on behalf of the Editor-in-charge {{ invitation.submission.editor_in_charge.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, we invited you to consider refereeing a Submission to {{ invitation.submission.submitted_to }}, namely<br><br>
+ Recently, on behalf of the Editor-in-charge {{ invitation.submission.editor_in_charge.profile.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, we invited you to consider refereeing a Submission to {{ invitation.submission.submitted_to }}, namely<br><br>
{{ invitation.submission.title }}<br>
by {{ invitation.submission.author_list }}<br>
(see https://scipost.org{{ invitation.submission.get_absolute_url }} - first submitted {{ invitation.submission.original_submission_date|date:"d M Y" }}).
diff --git a/templates/email/referees/invite_unregistered_to_referee_reminder2.html b/templates/email/referees/invite_unregistered_to_referee_reminder2.html
index 71e89874d..7388b23ba 100644
--- a/templates/email/referees/invite_unregistered_to_referee_reminder2.html
+++ b/templates/email/referees/invite_unregistered_to_referee_reminder2.html
@@ -3,7 +3,7 @@
Dear {{ invitation.get_title_display }} {{ invitation.last_name }},
</p>
<p>
- Recently, on behalf of the Editor-in-charge {{ invitation.submission.editor_in_charge.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, we invited you to consider refereeing a Submission to {{ invitation.submission.submitted_to }}, namely<br><br>
+ Recently, on behalf of the Editor-in-charge {{ invitation.submission.editor_in_charge.profile.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, we invited you to consider refereeing a Submission to {{ invitation.submission.submitted_to }}, namely<br><br>
{{ invitation.submission.title }}<br>
by {{ invitation.submission.author_list }}<br>
(see https://scipost.org{{ invitation.submission.get_absolute_url }} - first submitted {{ invitation.submission.original_submission_date|date:"d M Y" }}).
diff --git a/templates/email/referees/reinvite_contributor_to_referee.html b/templates/email/referees/reinvite_contributor_to_referee.html
index 053e5a39e..d87395665 100644
--- a/templates/email/referees/reinvite_contributor_to_referee.html
+++ b/templates/email/referees/reinvite_contributor_to_referee.html
@@ -10,7 +10,7 @@
(<a href="https://scipost.org{{ invitation.submission.get_absolute_url }}">see on SciPost.org</a>)
</p>
<p>
- have resubmitted their manuscript to SciPost. On behalf of the Editor-in-charge {{ invitation.submission.editor_in_charge.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, we would like to invite you to quickly review this new version.
+ have resubmitted their manuscript to SciPost. On behalf of the Editor-in-charge {{ invitation.submission.editor_in_charge.profile.get_title_display }} {{ invitation.submission.editor_in_charge.user.last_name }}, we would like to invite you to quickly review this new version.
</p>
<p>
Please accept or decline the invitation (login required) as soon as possible (ideally within the next 2 days).
diff --git a/templates/email/referees/remind_referee_deadline_1week.html b/templates/email/referees/remind_referee_deadline_1week.html
index 47fb08344..65bf441dd 100644
--- a/templates/email/referees/remind_referee_deadline_1week.html
+++ b/templates/email/referees/remind_referee_deadline_1week.html
@@ -1,5 +1,5 @@
<p>
- Dear {{ invitation.referee.get_title_display }} {{ invitation.referee.user.last_name }},
+ Dear {{ invitation.referee.profile.get_title_display }} {{ invitation.referee.user.last_name }},
</p>
<p>
This is a simple email to remind you of the approaching deadline (in one week) to send a Report on
diff --git a/templates/email/submissions_assignment_failed.html b/templates/email/submissions_assignment_failed.html
index 503253412..a1e2e83f7 100644
--- a/templates/email/submissions_assignment_failed.html
+++ b/templates/email/submissions_assignment_failed.html
@@ -1,4 +1,4 @@
-<p>Dear {{ object.submitted_by.get_title_display }} {{ object.submitted_by.user.last_name }},</p>
+<p>Dear {{ object.submitted_by.profile.get_title_display }} {{ object.submitted_by.user.last_name }},</p>
<p>Your recent Submission to SciPost,</p>
<p>{{ object.title }}</p>
<p>by {{ object.author_list }}</p>
diff --git a/theses/forms.py b/theses/forms.py
index 2a05dbdde..9939d0f4e 100644
--- a/theses/forms.py
+++ b/theses/forms.py
@@ -68,7 +68,7 @@ class VetThesisLinkForm(BaseRequestThesisLinkForm):
def vet_request(self, thesislink, user):
mail_params = {
- 'vocative_title': thesislink.requested_by.get_title_display(),
+ 'vocative_title': thesislink.requested_by.profile.get_title_display(),
'thesislink': thesislink,
'full_url': build_absolute_uri_using_site(thesislink.get_absolute_url())
}
--
GitLab