From 78c460432520fe50344a59780f75ad5960cc8ee5 Mon Sep 17 00:00:00 2001 From: Andy Byers Date: Fri, 19 Jul 2024 15:06:36 +0100 Subject: [PATCH 1/8] Fixes conflict. --- src/repository/forms.py | 7 + ...ository_review_submission_text_and_more.py | 29 ++++ src/repository/models.py | 15 +- src/repository/views.py | 31 ++--- src/static/admin/css/admin.css | 38 +++++ .../breadcrumbs/repository_submission.html | 39 ++++++ .../elements/layout/key_value_above.html | 18 +++ .../admin/repository/submit/authors.html | 5 +- .../admin/repository/submit/files.html | 6 +- .../admin/repository/submit/review.html | 131 ++++++++++++++---- .../admin/repository/submit/start.html | 4 +- 11 files changed, 267 insertions(+), 56 deletions(-) create mode 100644 src/repository/migrations/0044_historicalrepository_review_submission_text_and_more.py create mode 100644 src/templates/admin/elements/breadcrumbs/repository_submission.html create mode 100644 src/templates/admin/elements/layout/key_value_above.html diff --git a/src/repository/forms.py b/src/repository/forms.py index 54a7a30699..2d2a32e022 100755 --- a/src/repository/forms.py +++ b/src/repository/forms.py @@ -52,10 +52,16 @@ def __init__(self, *args, **kwargs): self.admin = kwargs.pop('admin', False) elements = self.request.repository.additional_submission_fields() super(PreprintInfo, self).__init__(*args, **kwargs) + if self.admin: self.fields.pop('submission_agreement') self.fields.pop('comments_editor') + # If using this form and there is an instance then this has + # previously been checked as it is required. + if self.instance: + self.fields['submission_agreement'].initial = True + self.fields['subject'].queryset = models.Subject.objects.filter( enabled=True, repository=self.request.repository, @@ -487,6 +493,7 @@ class Meta: 'limit_access_to_submission', 'submission_access_request_text', 'submission_access_contact', + 'review_submission_text', 'custom_js_code', 'review_helper', ) diff --git a/src/repository/migrations/0044_historicalrepository_review_submission_text_and_more.py b/src/repository/migrations/0044_historicalrepository_review_submission_text_and_more.py new file mode 100644 index 0000000000..e323f0868e --- /dev/null +++ b/src/repository/migrations/0044_historicalrepository_review_submission_text_and_more.py @@ -0,0 +1,29 @@ +# Generated by Django 4.2 on 2024-07-18 15:38 + +import core.model_utils +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('repository', '0043_auto_20240402_1256'), + ] + + operations = [ + migrations.AddField( + model_name='historicalrepository', + name='review_submission_text', + field=core.model_utils.JanewayBleachField(blank=True, default='

Please review your submission carefully. Make any necessary changes to ensure that all information is accurate and complete.

When you are satisfied with your review click the button below to finalize your submission.

', help_text='Text that displays on the review page just before the author completes their submission.

'), + ), + migrations.AddField( + model_name='repository', + name='review_submission_text', + field=core.model_utils.JanewayBleachField(blank=True, default='

Please review your submission carefully. Make any necessary changes to ensure that all information is accurate and complete.

When you are satisfied with your review click the button below to finalize your submission.

', help_text='Text that displays on the review page just before the author completes their submission.

'), + ), + migrations.AlterField( + model_name='repositoryfield', + name='help_text', + field=models.TextField(blank=True, null=True), + ), + ] diff --git a/src/repository/models.py b/src/repository/models.py index c596c47f0f..55f256f8bf 100755 --- a/src/repository/models.py +++ b/src/repository/models.py @@ -112,7 +112,11 @@ class Repository(model_utils.AbstractSiteModel): help_text='eg. preprints or articles', ) managers = models.ManyToManyField('core.Account', blank=True) - submission_notification_recipients = models.ManyToManyField('core.Account', blank=True, related_name='submission_notification_repositories') + submission_notification_recipients = models.ManyToManyField( + 'core.Account', + blank=True, + related_name='submission_notification_repositories', + ) logo = model_utils.SVGImageField( blank=True, null=True, @@ -226,6 +230,15 @@ class Repository(model_utils.AbstractSiteModel): help_text='Describe any supporting information you want users to supply when requesting' 'access permissions for this repository. Linked to Limit Access to Submissions.', ) + review_submission_text = model_utils.JanewayBleachField( + blank=True, + default="

Please review your submission carefully. Make any " + "necessary changes to ensure that all information is accurate " + "and complete.

When you are satisfied with your review " + "click the button below to finalize your submission.

", + help_text="Text that displays on the review page just before the " + "author completes their submission.

" + ) submission_access_contact = models.EmailField( blank=True, null=True, diff --git a/src/repository/views.py b/src/repository/views.py index f7061d2d52..8ea52e6ad7 100644 --- a/src/repository/views.py +++ b/src/repository/views.py @@ -747,21 +747,6 @@ def repository_files(request, preprint_id): if 'complete' in request.POST: if preprint.submission_file: - preprint.submit_preprint() - kwargs = {'request': request, 'preprint': preprint} - event_logic.Events.raise_event( - event_logic.Events.ON_PREPRINT_SUBMISSION, - **kwargs, - ) - - messages.add_message( - request, - messages.SUCCESS, - '{object} {title} submitted.'.format( - object=request.repository.object_name, - title=preprint.title - ) - ) return redirect( reverse( 'repository_review', @@ -798,12 +783,24 @@ def repository_review(request, preprint_id): models.Preprint, pk=preprint_id, owner=request.user, - date_submitted__isnull=False, repository=request.repository, ) if request.POST and 'complete' in request.POST: - + preprint.submit_preprint() + kwargs = {'request': request, 'preprint': preprint} + event_logic.Events.raise_event( + event_logic.Events.ON_PREPRINT_SUBMISSION, + **kwargs, + ) + messages.add_message( + request, + messages.SUCCESS, + '{object} {title} submitted.'.format( + object=request.repository.object_name, + title=preprint.title + ) + ) return redirect(reverse('repository_dashboard')) template = 'admin/repository/submit/review.html' diff --git a/src/static/admin/css/admin.css b/src/static/admin/css/admin.css index 9e25decb06..e5a82856a3 100644 --- a/src/static/admin/css/admin.css +++ b/src/static/admin/css/admin.css @@ -822,3 +822,41 @@ ul.menu { /* Temporary hotfix for compatibility with TinyMCE */ z-index: 10 !important; } + +.key-value-pair { + font-family: "Open Sans", sans-serif; + margin-bottom: 20px; +} + +.key-value-pair.key-above .key { + font-size: 16px; + line-height: 1.4; + text-align: left; + color: darkgray; + margin-bottom: 5px; +} + +.key-value-pair.key-above .value { + font-size: 18px; + line-height: 1.4; + text-align: left; +} + +.key-value-pair.key-above .value .inline-list { + display: inline; + list-style: none; + padding: 0; + margin: 0; +} + +.key-value-pair.key-above .value .inline-list li { + display: inline; +} + +.key-value-pair.key-above .value .inline-list li:after { + content: ", "; +} + +.key-value-pair.key-above .value .inline-list li:last-child:after { + content: ""; +} diff --git a/src/templates/admin/elements/breadcrumbs/repository_submission.html b/src/templates/admin/elements/breadcrumbs/repository_submission.html new file mode 100644 index 0000000000..cacde4c0bd --- /dev/null +++ b/src/templates/admin/elements/breadcrumbs/repository_submission.html @@ -0,0 +1,39 @@ +
  • + + {{ request.repository.name }} Dashboard + +
    • +
  • + + Metadata + +
    • + +
  • + {% if files or review %} + + Add Authors + + {% else %} + Add Authors + {% endif %} +
    • + +
  • + {% if review %} + + Add Files + + {% else %} + Add Files + {% endif %} +
    • +
  • + {% if review %} + + Review Submission + + {% else %} + Review Submission + {% endif %} +
    • \ No newline at end of file diff --git a/src/templates/admin/elements/layout/key_value_above.html b/src/templates/admin/elements/layout/key_value_above.html new file mode 100644 index 0000000000..a703e2e5ed --- /dev/null +++ b/src/templates/admin/elements/layout/key_value_above.html @@ -0,0 +1,18 @@ +
    +
    + {{ key }} +
    +
    + {% if list %} +
      + {% for item in value %} +
    • {{ item }}
      • + {% endfor %} +
    + {% elif render_line_breaks %} + {{ value|linebreaksbr|default_if_none:"No value supplied" }} + {% else %} + {{ value|default_if_none:"No value supplied" }} + {% endif %} +
    +
    \ No newline at end of file diff --git a/src/templates/admin/repository/submit/authors.html b/src/templates/admin/repository/submit/authors.html index facf8d69a9..1039e17d3e 100644 --- a/src/templates/admin/repository/submit/authors.html +++ b/src/templates/admin/repository/submit/authors.html @@ -9,10 +9,7 @@ {% endblock %} {% block breadcrumbs %} -
  • {{ request.repository.name }} - Dashboard
    • -
  • Start Submission
    • -
  • Add Authors
    • +{% include "admin/elements/breadcrumbs/repository_submission.html" with authors=True %} {% endblock %} {% block body %} diff --git a/src/templates/admin/repository/submit/files.html b/src/templates/admin/repository/submit/files.html index 08427206b8..e4d300f8bc 100644 --- a/src/templates/admin/repository/submit/files.html +++ b/src/templates/admin/repository/submit/files.html @@ -9,11 +9,7 @@ {% endblock %} {% block breadcrumbs %} -
  • {{ request.repository.name }} - Dashboard
    • -
  • Start Submission
    • -
  • Add Authors
    • -
  • Upload Files
    • +{% include "admin/elements/breadcrumbs/repository_submission.html" with files=True %} {% endblock %} diff --git a/src/templates/admin/repository/submit/review.html b/src/templates/admin/repository/submit/review.html index 9214836e9a..b79311e943 100644 --- a/src/templates/admin/repository/submit/review.html +++ b/src/templates/admin/repository/submit/review.html @@ -5,39 +5,118 @@ {% load field %} {% block title-section %} - {{ preprint.title }} {% trans 'Submission Complete' %} + Review Your {{ request.repository.object_name }} Submission {% endblock %} {% block breadcrumbs %} -
  • {{ request.repository.name }} - Dashboard
    • -
  • Start Submission
    • -
  • Add Authors
    • -
  • Upload Files
    • -
  • Submission Complete
    • + {% include "admin/elements/breadcrumbs/repository_submission.html" with review=True %} {% endblock %} {% block body %} -
    -
    -
    - -
    -

    Submission Complete

    -
    -

    Thank you for submitting your {{ request.repository.object_name }} to {{ request.repository.name }}.

    - -
    -

    Next Steps

    -
    -

    One of our team will review your submission and will be in touch. You can close the submission system using the button below, you will be taken to the dashboard.

    - -
    - {% csrf_token %} - -
    -
    +
    + +
    +
    +
    +

    {{ request.repository.object_name }} Metadata

    + Edit Metadata + +
    +
    + + {% include "admin/elements/layout/key_value_above.html" with key="Title" value=preprint.title %} + {% include "admin/elements/layout/key_value_above.html" with key="Abstract" value=preprint.abstract render_line_breaks=True %} + {% include "admin/elements/layout/key_value_above.html" with key="License" value=preprint.license.name %} + {% include "admin/elements/layout/key_value_above.html" with key="Published DOI" value=preprint.doi %} + {% include "admin/elements/layout/key_value_above.html" with key="Subjects" value=preprint.subject.all list=True %} + {% include "admin/elements/layout/key_value_above.html" with key="Keywords" value=preprint.keywords.all list=True %} + {% include "admin/elements/layout/key_value_above.html" with key="Comments to the Editor" value=preprint.comments_editor render_line_breaks=True %} + + {% for field_answer in preprint.repositoryfieldanswer_set.all %} + {% include "admin/elements/layout/key_value_above.html" with key=field_answer.field.name value=field_answer.answer render_line_breaks=True %} + {% endfor %} +
    + +
    +

    Authors

    + Edit + Authors +
    +
    + + + + + + + {% for author in preprint.preprintauthor_set.all %} + + + + + + {% endfor %} +
    Email AddressFirst NameLast Name
    {{ author.account.email }}{{ author.account.first_name }}{{ author.account.last_name }}
    +
    + +
    +

    Files

    + Edit + Files +
    +
    + + + + + + {% if preprint.submission_file %} + + + + + {% else %} + + + + {% endif %} +
    Original FilenameSize
    {{ preprint.submission_file.original_filename }}{{ preprint.submission_file.file.size|filesizeformat }}
    No file uploaded.
    +
    + +
    +

    Supplementary Files

    + + Edit Supplementary Files + +
    +
    +
      + {% for link in preprint.supplementaryfiles %} +
    • {{ link.label }}
      • + {% empty %} +
    • No Supplementary File
      • + {% endfor %} +
    +
    +
    + +
    +
    +

    Complete Submission

    +
    +
    + {{ request.repository.review_submission_text|safe }} +
    + {% csrf_token %} + +
    +
    +
    {% endblock %} diff --git a/src/templates/admin/repository/submit/start.html b/src/templates/admin/repository/submit/start.html index 09c2b29995..cfb4ce8396 100644 --- a/src/templates/admin/repository/submit/start.html +++ b/src/templates/admin/repository/submit/start.html @@ -9,9 +9,7 @@ {% endblock %} {% block breadcrumbs %} -
  • {{ request.repository.name }} - Dashboard
    • -
  • Start Submission
    • +{% include "admin/elements/breadcrumbs/repository_submission.html" with start=True %} {% endblock %} From 4e4f3a7d61b6a79b10cef07d7c62c4bd5b682a04 Mon Sep 17 00:00:00 2001 From: Andy Byers Date: Fri, 19 Jul 2024 15:56:07 +0100 Subject: [PATCH 2/8] #3478 updated HTML in repo/submit/review.html --- .../admin/repository/submit/review.html | 42 ++++++++++++------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/src/templates/admin/repository/submit/review.html b/src/templates/admin/repository/submit/review.html index b79311e943..6f8c3d4a05 100644 --- a/src/templates/admin/repository/submit/review.html +++ b/src/templates/admin/repository/submit/review.html @@ -20,12 +20,13 @@

    {{ request.repository.object_name }} Metadata

    - Edit Metadata + + Edit Metadata
    - {% include "admin/elements/layout/key_value_above.html" with key="Title" value=preprint.title %} {% include "admin/elements/layout/key_value_above.html" with key="Abstract" value=preprint.abstract render_line_breaks=True %} {% include "admin/elements/layout/key_value_above.html" with key="License" value=preprint.license.name %} @@ -33,7 +34,6 @@

    {{ request.repository.object_name }} Metadata

    {% include "admin/elements/layout/key_value_above.html" with key="Subjects" value=preprint.subject.all list=True %} {% include "admin/elements/layout/key_value_above.html" with key="Keywords" value=preprint.keywords.all list=True %} {% include "admin/elements/layout/key_value_above.html" with key="Comments to the Editor" value=preprint.comments_editor render_line_breaks=True %} - {% for field_answer in preprint.repositoryfieldanswer_set.all %} {% include "admin/elements/layout/key_value_above.html" with key=field_answer.field.name value=field_answer.answer render_line_breaks=True %} {% endfor %} @@ -41,9 +41,11 @@

    {{ request.repository.object_name }} Metadata

    Authors

    - Edit - Authors + + Edit Authors +
    @@ -64,8 +66,9 @@

    Authors

    Files

    - Edit - Files + + Edit Files +
    @@ -93,13 +96,22 @@

    Supplementary Files

    -
      - {% for link in preprint.supplementaryfiles %} -
    • {{ link.label }}
      • - {% empty %} -
    • No Supplementary File
      • +
    + + + + + {% for supp_file in preprint.supplementaryfiles %} + + + + + {% empty %} + + + {% endfor %} - +
    LabelLink
    {{ supp_file.label }}{{ supp_file.link }}
    No supplementary files supplied
    From bb9decf6e21e96ce76b0f1e87fab4a5003c715e2 Mon Sep 17 00:00:00 2001 From: Andy Byers Date: Fri, 19 Jul 2024 15:59:50 +0100 Subject: [PATCH 3/8] #3478 update link tag and add sr-only text. --- src/templates/admin/repository/submit/review.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/templates/admin/repository/submit/review.html b/src/templates/admin/repository/submit/review.html index 6f8c3d4a05..9c7652d974 100644 --- a/src/templates/admin/repository/submit/review.html +++ b/src/templates/admin/repository/submit/review.html @@ -104,7 +104,11 @@

    Supplementary Files

    {% for supp_file in preprint.supplementaryfiles %} {{ supp_file.label }} - {{ supp_file.link }} + + + {{ supp_file.url }} (external link, opens in new tab) + + {% empty %} From 98da7907cc0912b2b3decc476be48ed5361991cd Mon Sep 17 00:00:00 2001 From: Andy Byers Date: Fri, 19 Jul 2024 16:21:05 +0100 Subject: [PATCH 4/8] #3478 swap key color for dimgray hex code. Snrk. --- src/static/admin/css/admin.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/static/admin/css/admin.css b/src/static/admin/css/admin.css index e5a82856a3..2338549ca1 100644 --- a/src/static/admin/css/admin.css +++ b/src/static/admin/css/admin.css @@ -832,7 +832,7 @@ ul.menu { font-size: 16px; line-height: 1.4; text-align: left; - color: darkgray; + color: #696969; margin-bottom: 5px; } From 0f8c90c92bfd21fbf9ed8a7455271fc65a2c427b Mon Sep 17 00:00:00 2001 From: Andy Byers Date: Mon, 22 Jul 2024 10:43:01 +0100 Subject: [PATCH 5/8] #3478 simplify the template logic for repository submission breadcrumb. --- .../breadcrumbs/repository_submission.html | 46 +++++++++++-------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/src/templates/admin/elements/breadcrumbs/repository_submission.html b/src/templates/admin/elements/breadcrumbs/repository_submission.html index cacde4c0bd..e5082cc039 100644 --- a/src/templates/admin/elements/breadcrumbs/repository_submission.html +++ b/src/templates/admin/elements/breadcrumbs/repository_submission.html @@ -4,36 +4,42 @@
  • + {% if preprint %} Metadata -
    • - -
  • - {% if files or review %} - - Add Authors - {% else %} - Add Authors + Metadata {% endif %}
    • -
  • - {% if review %} +{% if files or review %} +
  • + + Add Authors + +
    • +{% elif authors %} +
  • + Add Authors +
    • +{% endif %} + +{% if review %} +
  • Add Files - {% else %} +
    • +{% elif files %} +
  • Add Files - {% endif %} -
    • + +{% endif %} + + +{% if review %}
  • - {% if review %} - - Review Submission - - {% else %} Review Submission - {% endif %} -
    • \ No newline at end of file + +{% endif %} \ No newline at end of file From dd2b28b325373bb9d268738689a94329925d2329 Mon Sep 17 00:00:00 2001 From: Andy Byers Date: Wed, 7 Aug 2024 13:15:46 +0100 Subject: [PATCH 6/8] #3478 addreses inline review comments. --- src/static/admin/css/admin.css | 8 ++++---- src/templates/admin/elements/layout/key_value_above.html | 2 +- src/templates/admin/repository/submit/authors.html | 2 +- src/templates/admin/repository/submit/files.html | 2 +- src/templates/admin/repository/submit/review.html | 2 +- src/templates/admin/repository/submit/start.html | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/static/admin/css/admin.css b/src/static/admin/css/admin.css index 2338549ca1..3f78b3e64e 100644 --- a/src/static/admin/css/admin.css +++ b/src/static/admin/css/admin.css @@ -825,19 +825,19 @@ ul.menu { .key-value-pair { font-family: "Open Sans", sans-serif; - margin-bottom: 20px; + margin-bottom: 1.25rem; } .key-value-pair.key-above .key { - font-size: 16px; + font-size: 1rem; line-height: 1.4; text-align: left; color: #696969; - margin-bottom: 5px; + margin-bottom: 0.31rem; } .key-value-pair.key-above .value { - font-size: 18px; + font-size: 1.125rem; line-height: 1.4; text-align: left; } diff --git a/src/templates/admin/elements/layout/key_value_above.html b/src/templates/admin/elements/layout/key_value_above.html index a703e2e5ed..2708a751f8 100644 --- a/src/templates/admin/elements/layout/key_value_above.html +++ b/src/templates/admin/elements/layout/key_value_above.html @@ -12,7 +12,7 @@ {% elif render_line_breaks %} {{ value|linebreaksbr|default_if_none:"No value supplied" }} {% else %} - {{ value|default_if_none:"No value supplied" }} + {{ value|default:"No value supplied" }} {% endif %}
    \ No newline at end of file diff --git a/src/templates/admin/repository/submit/authors.html b/src/templates/admin/repository/submit/authors.html index 1039e17d3e..6d256c22d9 100644 --- a/src/templates/admin/repository/submit/authors.html +++ b/src/templates/admin/repository/submit/authors.html @@ -100,7 +100,7 @@

    {% trans 'Authors' %}

    {% trans 'Once you have added all of your authors you can complete this stage.' %}

    {% csrf_token %} - +
    diff --git a/src/templates/admin/repository/submit/files.html b/src/templates/admin/repository/submit/files.html index e4d300f8bc..64d3fd943b 100644 --- a/src/templates/admin/repository/submit/files.html +++ b/src/templates/admin/repository/submit/files.html @@ -86,7 +86,7 @@

    Supplementary File

    {% csrf_token %} - +
    diff --git a/src/templates/admin/repository/submit/review.html b/src/templates/admin/repository/submit/review.html index 9c7652d974..5f39ec56e2 100644 --- a/src/templates/admin/repository/submit/review.html +++ b/src/templates/admin/repository/submit/review.html @@ -128,7 +128,7 @@

    Complete Submission

    {% csrf_token %}
    diff --git a/src/templates/admin/repository/submit/start.html b/src/templates/admin/repository/submit/start.html index cfb4ce8396..10c537acc0 100644 --- a/src/templates/admin/repository/submit/start.html +++ b/src/templates/admin/repository/submit/start.html @@ -89,7 +89,7 @@

    {% trans "Metadata" %}

    From bf0fb010cab225e2eb9e257566edd3f5b3a0ef91 Mon Sep 17 00:00:00 2001 From: Andy Byers Date: Wed, 7 Aug 2024 14:32:26 +0100 Subject: [PATCH 7/8] #3478 use a definition list to make content semantic --- src/static/admin/css/admin.css | 1 + .../elements/layout/key_value_above.html | 18 ++++++++++----- .../admin/repository/submit/review.html | 22 ++++++++++--------- 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/src/static/admin/css/admin.css b/src/static/admin/css/admin.css index 3f78b3e64e..293f240f5f 100644 --- a/src/static/admin/css/admin.css +++ b/src/static/admin/css/admin.css @@ -834,6 +834,7 @@ ul.menu { text-align: left; color: #696969; margin-bottom: 0.31rem; + font-weight: normal; } .key-value-pair.key-above .value { diff --git a/src/templates/admin/elements/layout/key_value_above.html b/src/templates/admin/elements/layout/key_value_above.html index 2708a751f8..ce8f663829 100644 --- a/src/templates/admin/elements/layout/key_value_above.html +++ b/src/templates/admin/elements/layout/key_value_above.html @@ -1,8 +1,16 @@ +{% comment %} + This template should be wrapped in
    tags when included. Example: +
    + {% include "admin/elements/layout/key_value_above.html" with key="Title" value=preprint.title %} + {% include "admin/elements/layout/key_value_above.html" with key="Abstract" value=preprint.abstract %} +
    +{% endcomment %} +
    -
    +
    {{ key }} -
    -
    + +
    {% if list %}
      {% for item in value %} @@ -10,9 +18,9 @@ {% endfor %}
    {% elif render_line_breaks %} - {{ value|linebreaksbr|default_if_none:"No value supplied" }} + {{ value|linebreaksbr|default:"No value supplied" }} {% else %} {{ value|default:"No value supplied" }} {% endif %} -
    +
    \ No newline at end of file diff --git a/src/templates/admin/repository/submit/review.html b/src/templates/admin/repository/submit/review.html index 5f39ec56e2..f4dbd2ce29 100644 --- a/src/templates/admin/repository/submit/review.html +++ b/src/templates/admin/repository/submit/review.html @@ -27,16 +27,18 @@

    {{ request.repository.object_name }} Metadata

    - {% include "admin/elements/layout/key_value_above.html" with key="Title" value=preprint.title %} - {% include "admin/elements/layout/key_value_above.html" with key="Abstract" value=preprint.abstract render_line_breaks=True %} - {% include "admin/elements/layout/key_value_above.html" with key="License" value=preprint.license.name %} - {% include "admin/elements/layout/key_value_above.html" with key="Published DOI" value=preprint.doi %} - {% include "admin/elements/layout/key_value_above.html" with key="Subjects" value=preprint.subject.all list=True %} - {% include "admin/elements/layout/key_value_above.html" with key="Keywords" value=preprint.keywords.all list=True %} - {% include "admin/elements/layout/key_value_above.html" with key="Comments to the Editor" value=preprint.comments_editor render_line_breaks=True %} - {% for field_answer in preprint.repositoryfieldanswer_set.all %} - {% include "admin/elements/layout/key_value_above.html" with key=field_answer.field.name value=field_answer.answer render_line_breaks=True %} - {% endfor %} +
    + {% include "admin/elements/layout/key_value_above.html" with key="Title" value=preprint.title %} + {% include "admin/elements/layout/key_value_above.html" with key="Abstract" value=preprint.abstract render_line_breaks=True %} + {% include "admin/elements/layout/key_value_above.html" with key="License" value=preprint.license.name %} + {% include "admin/elements/layout/key_value_above.html" with key="Published DOI" value=preprint.doi %} + {% include "admin/elements/layout/key_value_above.html" with key="Subjects" value=preprint.subject.all list=True %} + {% include "admin/elements/layout/key_value_above.html" with key="Keywords" value=preprint.keywords.all list=True %} + {% include "admin/elements/layout/key_value_above.html" with key="Comments to the Editor" value=preprint.comments_editor render_line_breaks=True %} + {% for field_answer in preprint.repositoryfieldanswer_set.all %} + {% include "admin/elements/layout/key_value_above.html" with key=field_answer.field.name value=field_answer.answer render_line_breaks=True %} + {% endfor %} +
    From 4d2665d423ed115d12206d1413669cbbe4a19b26 Mon Sep 17 00:00:00 2001 From: Andy Byers Date: Tue, 13 Aug 2024 09:22:44 +0100 Subject: [PATCH 8/8] #3478 removes stray closing paragraph tag. --- ...44_historicalrepository_review_submission_text_and_more.py | 4 ++-- src/repository/models.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/repository/migrations/0044_historicalrepository_review_submission_text_and_more.py b/src/repository/migrations/0044_historicalrepository_review_submission_text_and_more.py index e323f0868e..79e9bf097e 100644 --- a/src/repository/migrations/0044_historicalrepository_review_submission_text_and_more.py +++ b/src/repository/migrations/0044_historicalrepository_review_submission_text_and_more.py @@ -14,12 +14,12 @@ class Migration(migrations.Migration): migrations.AddField( model_name='historicalrepository', name='review_submission_text', - field=core.model_utils.JanewayBleachField(blank=True, default='

    Please review your submission carefully. Make any necessary changes to ensure that all information is accurate and complete.

    When you are satisfied with your review click the button below to finalize your submission.

    ', help_text='Text that displays on the review page just before the author completes their submission.

    '), + field=core.model_utils.JanewayBleachField(blank=True, default='

    Please review your submission carefully. Make any necessary changes to ensure that all information is accurate and complete.

    When you are satisfied with your review click the button below to finalize your submission.

    ', help_text='Text that displays on the review page just before the author completes their submission.'), ), migrations.AddField( model_name='repository', name='review_submission_text', - field=core.model_utils.JanewayBleachField(blank=True, default='

    Please review your submission carefully. Make any necessary changes to ensure that all information is accurate and complete.

    When you are satisfied with your review click the button below to finalize your submission.

    ', help_text='Text that displays on the review page just before the author completes their submission.

    '), + field=core.model_utils.JanewayBleachField(blank=True, default='

    Please review your submission carefully. Make any necessary changes to ensure that all information is accurate and complete.

    When you are satisfied with your review click the button below to finalize your submission.

    ', help_text='Text that displays on the review page just before the author completes their submission.'), ), migrations.AlterField( model_name='repositoryfield', diff --git a/src/repository/models.py b/src/repository/models.py index 55f256f8bf..c2533e1bd4 100755 --- a/src/repository/models.py +++ b/src/repository/models.py @@ -237,7 +237,7 @@ class Repository(model_utils.AbstractSiteModel): "and complete.

    When you are satisfied with your review " "click the button below to finalize your submission.

    ", help_text="Text that displays on the review page just before the " - "author completes their submission.

    " + "author completes their submission." ) submission_access_contact = models.EmailField( blank=True,