From a04dd9abda1156abb730b361faa77dc6c9ad1697 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Tue, 29 Sep 2020 09:09:17 +0200
Subject: [PATCH] Work on removing discipline from submissions
---
.../journals/_publication_card_content.html | 4 ++--
.../partials/submissions/submission_summary.html | 14 ++++++++++----
submissions/templates/submissions/report_form.html | 2 +-
submissions/urls.py | 2 --
4 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/journals/templates/journals/_publication_card_content.html b/journals/templates/journals/_publication_card_content.html
index e2a8155b4..661d1a412 100644
--- a/journals/templates/journals/_publication_card_content.html
+++ b/journals/templates/journals/_publication_card_content.html
@@ -1,7 +1,7 @@
<div class="card-header">
- <h3 class="my-0"><a href="{{publication.get_absolute_url}}">{{ publication.title }}</a></h3>
+ <h3 class="my-0"><a href="{{ publication.get_absolute_url }}">{{ publication.title }}</a></h3>
</div>
-<div class="card-body publication-{{publication.id}}">
+<div class="card-body publication-{{ publication.id }}">
<div class="row justify-content-between mb-0">
<div class="col">
<p class="card-text mb-2">{{ publication.author_list }}</p>
diff --git a/submissions/templates/partials/submissions/submission_summary.html b/submissions/templates/partials/submissions/submission_summary.html
index dc4733eda..c90d48a45 100644
--- a/submissions/templates/partials/submissions/submission_summary.html
+++ b/submissions/templates/partials/submissions/submission_summary.html
@@ -91,12 +91,18 @@
{% endif %}
{% endwith %}
<tr>
- <td>Discipline:</td>
- <td>{{ submission.get_discipline_display }}</td>
+ <td>Academic field:</td>
+ <td>{{ submission.acad_field }}</td>
</tr>
<tr>
- <td>Subject area:</td>
- <td>{{ submission.get_subject_area_display }}</td>
+ <td>Specialties:</td>
+ <td>
+ <ul class="m-0 pl-4">
+ {% for specialty in submission.specialties.all %}
+ <li>{{ specialty }}</li>
+ {% endfor %}
+ </ul>
+ </td>
</tr>
{% if submission.approaches %}
<tr>
diff --git a/submissions/templates/submissions/report_form.html b/submissions/templates/submissions/report_form.html
index 06c987e32..471d796a2 100644
--- a/submissions/templates/submissions/report_form.html
+++ b/submissions/templates/submissions/report_form.html
@@ -42,7 +42,7 @@
<div class="card-body pb-1">
<ul>
<li>This manuscript was submitted to <strong>{{ submission.submitted_to }}</strong>. Please make sure that you refer to this journal's <a href="{% url 'journal:about' doi_label=submission.submitted_to.doi_label %}#criteria" target="_blank"><strong>acceptance criteria</strong></a> in your evaluation.</li>
- <li>If you feel the article would be more appropriately published in one of our <a href="{% url 'journals:journals' %}?field={{ submission.discipline }}" target="_blank"><strong>other {{ submission.get_discipline_display }} Journals</strong></a>, please
+ <li>If you feel the article would be more appropriately published in one of our <a href="{% url 'journals:journals' %}?field={{ submission.acad_field.slug }}" target="_blank"><strong>other {{ submission.adac_field }} Journals</strong></a>, please
<ul>
<li>select <em>Accept in alternative Journal</em> in the <strong>Recommendation</strong> field</li>
<li>in the <strong>Report</strong> field, specify the alternative Journal in which you would recommend acceptance
diff --git a/submissions/urls.py b/submissions/urls.py
index 057f9de7b..a472fbcae 100644
--- a/submissions/urls.py
+++ b/submissions/urls.py
@@ -6,7 +6,6 @@ from django.conf.urls import url
from django.urls import path, register_converter
from django.views.generic import TemplateView
-from scipost.converters import DisciplineConverter
from journals.converters import JournalDOILabelConverter
from ontology.converters import AcademicFieldSlugConverter
@@ -15,7 +14,6 @@ from .constants import SUBMISSIONS_WO_VN_REGEX, SUBMISSIONS_COMPLETE_REGEX
app_name = 'submissions'
-register_converter(DisciplineConverter, 'discipline')
register_converter(JournalDOILabelConverter, 'journal_doi_label')
register_converter(AcademicFieldSlugConverter, 'acad_field')
--
GitLab