diff --git a/README.md b/README.md
index d2a93bd1c4ecda2ef2dfa8ba185d2a3dfa633505..d4549003bc656b5061462e47133d85e4e5f89303 100644
--- a/README.md
+++ b/README.md
@@ -157,7 +157,23 @@ can use them.
```
## Documentation
-Project documentation can be found in `docs` and can be rendered using
+All project documentation is gathered from `.rst` files and code-embedded docstrings.
+The documentation itself can be found in `docs`.
+
+### Sphinxdoc
+The documentation is saved in the local database as a Project with name `SciPost`
+(this project should be manually created in the admin under the `Sphinxdoc` app).
+
+To update the docs, simply run
+```shell
+(scipostenv) $ python3 ../manage.py updatedoc -b scipost
+```
+
+The documentation is then viewable by navigating to `docs/`.
+
+
+### Locally-served
+The documentation can be rendered using
[Sphinx](http://www.sphinx-doc.org/). Note that rendering documentation is only
available from the virtual environment - and only when the host settings have
been configured.
diff --git a/comments/admin.py b/comments/admin.py
index ac6a36e65aab47674d8579434abd6d721b104d8f..6cfa6fa189234c235205ff884230843cb796e43a 100644
--- a/comments/admin.py
+++ b/comments/admin.py
@@ -4,13 +4,17 @@ from .constants import STATUS_VETTED
from .models import Comment
+def comment_opening(comment):
+ return comment.comment_text[:30] + '...'
+
+
def comment_is_vetted(comment):
'''Check if comment is vetted.'''
return comment.status is STATUS_VETTED
class CommentAdmin(admin.ModelAdmin):
- list_display = ('comment_text', 'author', 'date_submitted', comment_is_vetted)
+ list_display = (comment_opening, 'author', 'date_submitted', comment_is_vetted)
date_hierarchy = 'date_submitted'
list_filter = ('status',)
comment_is_vetted.boolean = True
diff --git a/docs/contributors/contributors.rst b/docs/contributors/contributors.rst
deleted file mode 100644
index a8de5a00fe9861ad6ba1ed60d219b6d1eebba549..0000000000000000000000000000000000000000
--- a/docs/contributors/contributors.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-For Contributors
-================
-
-
-.. toctree::
- :maxdepth: 2
-
- editorial_fellows/editorial_fellows
- editorial_administrators/editorial_administrators
diff --git a/docs/contributors/editorial_fellows/editorial_fellows.rst b/docs/contributors/editorial_fellows/editorial_fellows.rst
deleted file mode 100644
index 506d4173785b2206f943563ecafa68f4b0ae1a6c..0000000000000000000000000000000000000000
--- a/docs/contributors/editorial_fellows/editorial_fellows.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-For Editorial Fellows
-=====================
diff --git a/docs/guides/guides.rst b/docs/guides/guides.rst
new file mode 100644
index 0000000000000000000000000000000000000000..fcb34041d6e101fc71e625ecd489cc46bafc71bd
--- /dev/null
+++ b/docs/guides/guides.rst
@@ -0,0 +1,10 @@
+Guides
+======
+
+
+.. toctree::
+ :maxdepth: 2
+
+ submissions_processing/submissions_processing
+ production/production
+ maintenance/maintenance
diff --git a/docs/guides/maintenance/maintenance.rst b/docs/guides/maintenance/maintenance.rst
new file mode 100644
index 0000000000000000000000000000000000000000..82ab83716d571b416716ac03deafe5d6eaa82247
--- /dev/null
+++ b/docs/guides/maintenance/maintenance.rst
@@ -0,0 +1,8 @@
+Maintenance
+===========
+
+
+.. toctree::
+ :maxdepth: 2
+
+ maintenance/maintenance
diff --git a/docs/contributors/editorial_administrators/maintenance.rst b/docs/guides/maintenance/maintenance/maintenance.rst
similarity index 72%
rename from docs/contributors/editorial_administrators/maintenance.rst
rename to docs/guides/maintenance/maintenance/maintenance.rst
index ee7dc9e6f594a447dd3e25c5a95a5e3634fab86b..02a6140f0dc143bba0638cacbad7c719a592c86a 100644
--- a/docs/contributors/editorial_administrators/maintenance.rst
+++ b/docs/guides/maintenance/maintenance/maintenance.rst
@@ -1,5 +1,5 @@
-Maintenance of published material
-=================================
+Maintenance of SciPost Publications
+===================================
This guide is meant for **Editorial Administrators**.
It describes the post-publication maintenance of the published material.
diff --git a/docs/contributors/editorial_administrators/production.rst b/docs/guides/production/initial_production/initial_production.rst
similarity index 69%
rename from docs/contributors/editorial_administrators/production.rst
rename to docs/guides/production/initial_production/initial_production.rst
index 89b6d428ee387546e0c10cb564f549839ccdcd32..937068f30fb0171264f45ed703b16aaca525c3b9 100644
--- a/docs/contributors/editorial_administrators/production.rst
+++ b/docs/guides/production/initial_production/initial_production.rst
@@ -3,7 +3,7 @@
Production of SciPost Publications
==================================
-This guide is meant for **Editorial Administrators** and **Production Officers**. It describes the post-acceptance workflow from paper acceptance to publication.
+This guide is meant for **Editorial Administrators**, **Production Supervisors** and **Production Officers**. It describes the post-acceptance workflow from paper acceptance to publication.
Version: 2017-05-11.
@@ -37,7 +37,7 @@ Source retrieval and folder preparation
#. Copy the paper’s sources one level down (so from ``####.#####v#`` to
the current directory). BE CAREFUL: if the authors have included any of
the SciPost style files (``SciPost.cls``, ``SciPost_bibstyle.bst``), DO NOT
- copy those down. You can skip this step if the previous step immediately led
+ copy those down. You can skip this step if the previous step immediately led
to a ``.tex`` file.
#. Copy the files in
``[Journal full name]/v##_production/FILES_TO_COPY_IN_PAPER_DIR``
@@ -216,7 +216,7 @@ Step-by-step procedure
If a single horizontal line is pushed to the next page, correct by
playing with negatime ``\vspace``.
-
+
#. TODO: COPYRIGHT
@@ -400,8 +400,8 @@ References formatting
If not, use the format ``\href{https://arxiv.org/abs/####.#####}{arXiv:####.#####}``,
and remove any ``(YEAR)``.
- \J. Stat. Mech. is annoying (volume number is year). Manually remove volume nr for
- these, so the format becomes ``A. Bee, \emp{Bee's nice paper}, J. Stat. Mech.: Th. Exp. [P,L]##### (20##), \doi{10...}.``
+ \J. Stat. Mech. and JHEP are annoying (because the volume number is the year).
+ Manually remove volume nr for these, so the format becomes ``A. Bee, \emp{Bee's nice paper}, J. Stat. Mech.: Th. Exp. [P,L]##### (20##), \doi{10...}.``
\J. Phys. A is also annoying. Up to and including volume 39 (2006), it's
\J. Phys. A: Math. Gen. Afterwards, volume 40 (2007) onwards, it's
@@ -413,7 +413,7 @@ References formatting
Check that all DOIs work. Remove the ``\meta`` at the end of the bibitem
if it is present.
-
+
Layout verification
~~~~~~~~~~~~~~~~~~~
@@ -423,163 +423,3 @@ Layout verification
In particular, the punctuation of equations should be checked and corrected
if necessary.
-
-
-Proofs
-------
-
- * Once the paper has been properly formatted, the ``.tex`` and ``.pdf`` files
- should be copied into new files carrying the ``_proofs_v[nr]`` suffix,
- for example ``SciPost_Phys_1699_9999v9_Bee_proofs_v1.tex``.
-
- * The ``.pdf`` proofs should be emailed to the authors for verification.
- Authors should return either an annotated pdf or a list of corrections
- by plain text email.
-
- * Any modifications should be implemented directly in the main ``.tex`` file.
-
- * If any further check by the authors are required, start this proofs
- todo-list again, increasing the proofs version number.
-
- * Once the authors have approved the proofs, the paper can be put forward
- to online publication.
-
-
-Online publication
-------------------
-
- These tasks must be performed by an **Editorial Administrator**.
-
-
-Preparation of final version of record
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- #. Copy the whole paper folder from folder [journal name]/IN\_PRODUCTION \\to [journal name]/Volume\_[volume nr].
-
- #. Check online to see which paper number is next available.
-
- #. Rename this folder using the convention [journal name]\_[volume number]([issue number])\_[paper nr].
-
- #. Within this folder, take the author-accepted version tex file and rename it using the convention [journal name abbrev]\_[volume nr]\_[issue nr]\_[paper nr].tex.
-
- #. In this tex source, replace the ??? with the 3-digit paper number (3 places: 2 in preamble, 1 in copyright statement).
-
- #. Ensure that the author names are in format Abe Bee, Cee Dee and Elle Fine.
-
- #. Insert the correct Received, Accepted and Published dates in copyright statement.
-
- #. Make sure linenumbers are deactivated.
-
- #. Does the table of contents (if present) look OK? (Beware of hanging closing
- line pushed to top of second page). If needed, adjust the ``\vspace`` spacings
- defined around the table of contents, and/or insert an additional ``vspace``
- with negative spacing before the abstract.
-
- #. If the author-accepted proofs version used BiBTeX, copy the contents of the bbl
- file into the .tex file, so that BiBTeX is not needed anymore.
-
- #. Verify each reference: authors, title, journal reference, doi link.
- Manually correct any incorrect references.
-
- #. Recompile the LaTeX, and CAREFULLY CHECK EVERYTHING.
-
-
-Uploading to ``scipost.org``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
- #. From the Submissions Pool, click on the link to initiate the publication process.
-
- #. Fill in the initiate publication form (using the dates in format YYYY-MM-DD). Submit. You are now on the validate publication page.
-
- #. Check that the paper number is correct. If not, modify the final tex source to account for this (see previous subsection).
-
- #. Select who the first author is (if registered as a Contributor; if not, inform the EdAdmin, and choose another author who is registered).
-
- #. Select the final version's pdf file.
-
- #. Submit. The paper is now published online.
-
-
-Metadata preparation and DOI registration with Crossref
--------------------------------------------------------
-
- These tasks must be performed by **Editorial Administrators**,
- who have access to the Publication's editorial tools
- by navigating to the Publication's page.
-
-
-Author listing
-~~~~~~~~~~~~~~
-
- If not all authors appear in the list presented at the top of the EdAdmin tools,
- these should be added by following the ``Add a missing author`` link.
-
- The search form can be used to find missing authors who might be
- Registered Contributors. If found, a one-click process adds them.
-
- You can otherwise create an UnregisteredAuthor object instance and link
- it to the publication, by simply filling in the first and last name fields
- and clicking on ``Add``.
-
-
-Preparation of the citations list
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- Follow the ``Create/update citation list metadata`` link.
-
- In the text area, paste the entire list of bibitems from the paper's
- final ``.tex`` file. Upon clicking on ``Submit``, all DOI entires
- are extracted and formatted into XML metadata which is saved in the
- database.
-
- Citations with no valid DOI (*e.g.* arXiv preprints, books, etc)
- do not appear in the metadata.
-
-
-Funding info
-~~~~~~~~~~~~
-
- Following the ``Create/update funding info metadata`` link leads to a
- page where the funding statement of the Publication's ``.tex`` file
- (found either as a separate subsection or in the Acknowledgements)
- can be pasted.
-
-
-Preparation of the metadata XML
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- Following the ``Create/update metadata XML`` link auto-generates a
- full XML text field containing all the provided information,
- properly formatted for the upcoming submission to Crossref.
-
- Verify that the first author is indeed enclosed in a
- ``<person_name sequence='first' contributor_role='author'>`` tag,
- and that subsequent authors (enclosed in
- ``<person_name sequence='additional' contributor_role='author'>`` tags)
- appear in the order of the Publication's author list.
-
- Once the metadata is set, clicking on ``Accept the metadata``
- saves the metadata to the database and returns one to the Publication's
- page.
-
-
-Metadata testing and deposit
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- At this stage, the metadata is ready for uploading to Crossref.
- This occurs via a POST query to either the test or live Crossref server.
-
- Clicking on ``Test metadata deposit`` immediately posts the metadata
- to the test server, and takes you to a page where the server's
- response headers are displayed. The server also sends a more detailed
- response via email
- (to ``admin@scipost.org``; if you do not have access to this mailbox,
- ask SciPost Administration) with the success status.
-
- Similarly, the actual deposit is immediately performed upon clicking on the
- ``Deposit the metadata to Crossref``. The response headers are displayed,
- and a detailed email response is sent by Crossref to ``admin@scipost.org``.
-
-
- **This completes the publication process.**
diff --git a/docs/guides/production/online_publication/online_publication.rst b/docs/guides/production/online_publication/online_publication.rst
new file mode 100644
index 0000000000000000000000000000000000000000..92c29b6ef4609e75843f1ed61bd4ddfa9ae5be91
--- /dev/null
+++ b/docs/guides/production/online_publication/online_publication.rst
@@ -0,0 +1,148 @@
+.. Howto for publication production
+
+Online Publication
+==================
+
+This guide is meant for **Editorial Administrators**. It describes the final publication of manuscripts, after final author proofs approval.
+
+Version: 2017-05-11.
+
+
+Finalization of manuscript production
+-------------------------------------
+
+The steps described here follow up on the :doc:`production` instructions used by production officers.
+
+
+Preparation of final version of record
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ #. Copy the whole paper folder from folder [journal name]/IN\_PRODUCTION \\to [journal name]/Volume\_[volume nr].
+
+ #. Check online to see which paper number is next available.
+
+ #. Rename this folder using the convention [journal name]\_[volume number]([issue number])\_[paper nr].
+
+ #. Within this folder, take the author-accepted version tex file and rename it using the convention [journal name abbrev]\_[volume nr]\_[issue nr]\_[paper nr].tex.
+
+ #. In this tex source, replace the ??? with the 3-digit paper number (3 places: 2 in preamble, 1 in copyright statement).
+
+ #. Ensure that the author names are in format Abe Bee, Cee Dee and Elle Fine.
+
+ #. Insert the correct Received, Accepted and Published dates in copyright statement.
+
+ #. Make sure linenumbers are deactivated.
+
+ #. Does the table of contents (if present) look OK? (Beware of hanging closing
+ line pushed to top of second page). If needed, adjust the ``\vspace`` spacings
+ defined around the table of contents, and/or insert an additional ``vspace``
+ with negative spacing before the abstract.
+
+ #. If the author-accepted proofs version used BiBTeX, copy the contents of the bbl
+ file into the .tex file, so that BiBTeX is not needed anymore.
+
+ #. Verify each reference: authors, title, journal reference, doi link.
+ Manually correct any incorrect references.
+
+ #. Recompile the LaTeX, and CAREFULLY CHECK EVERYTHING.
+
+
+Uploading to ``scipost.org``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+ #. From the Submissions Pool, click on the link to initiate the publication process.
+
+ #. Fill in the initiate publication form (using the dates in format YYYY-MM-DD). Submit. You are now on the validate publication page.
+
+ #. Check that the paper number is correct. If not, modify the final tex source to account for this (see previous subsection).
+
+ #. Select who the first author is (if registered as a Contributor; if not, inform the EdAdmin, and choose another author who is registered).
+
+ #. Select the final version's pdf file.
+
+ #. Submit. The paper is now published online.
+
+
+Metadata preparation and DOI registration with Crossref
+-------------------------------------------------------
+
+ These tasks must be performed by **Editorial Administrators**,
+ who have access to the Publication's editorial tools
+ by navigating to the Publication's page.
+
+
+Author listing
+~~~~~~~~~~~~~~
+
+ If not all authors appear in the list presented at the top of the EdAdmin tools,
+ these should be added by following the ``Add a missing author`` link.
+
+ The search form can be used to find missing authors who might be
+ Registered Contributors. If found, a one-click process adds them.
+
+ You can otherwise create an UnregisteredAuthor object instance and link
+ it to the publication, by simply filling in the first and last name fields
+ and clicking on ``Add``.
+
+
+Preparation of the citations list
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ Follow the ``Create/update citation list metadata`` link.
+
+ In the text area, paste the entire list of bibitems from the paper's
+ final ``.tex`` file. Upon clicking on ``Submit``, all DOI entires
+ are extracted and formatted into XML metadata which is saved in the
+ database.
+
+ Citations with no valid DOI (*e.g.* arXiv preprints, books, etc)
+ do not appear in the metadata.
+
+
+Funding info
+~~~~~~~~~~~~
+
+ Following the ``Create/update funding info metadata`` link leads to a
+ page where the funding statement of the Publication's ``.tex`` file
+ (found either as a separate subsection or in the Acknowledgements)
+ can be pasted.
+
+
+Preparation of the metadata XML
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ Following the ``Create/update metadata XML`` link auto-generates a
+ full XML text field containing all the provided information,
+ properly formatted for the upcoming submission to Crossref.
+
+ Verify that the first author is indeed enclosed in a
+ ``<person_name sequence='first' contributor_role='author'>`` tag,
+ and that subsequent authors (enclosed in
+ ``<person_name sequence='additional' contributor_role='author'>`` tags)
+ appear in the order of the Publication's author list.
+
+ Once the metadata is set, clicking on ``Accept the metadata``
+ saves the metadata to the database and returns one to the Publication's
+ page.
+
+
+Metadata testing and deposit
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ At this stage, the metadata is ready for uploading to Crossref.
+ This occurs via a POST query to either the test or live Crossref server.
+
+ Clicking on ``Test metadata deposit`` immediately posts the metadata
+ to the test server, and takes you to a page where the server's
+ response headers are displayed. The server also sends a more detailed
+ response via email
+ (to ``admin@scipost.org``; if you do not have access to this mailbox,
+ ask SciPost Administration) with the success status.
+
+ Similarly, the actual deposit is immediately performed upon clicking on the
+ ``Deposit the metadata to Crossref``. The response headers are displayed,
+ and a detailed email response is sent by Crossref to ``admin@scipost.org``.
+
+
+ **This completes the publication process.**
diff --git a/docs/guides/production/production.rst b/docs/guides/production/production.rst
new file mode 100644
index 0000000000000000000000000000000000000000..0d2e6d139bae69d46084939bf8c28a61e0e51369
--- /dev/null
+++ b/docs/guides/production/production.rst
@@ -0,0 +1,10 @@
+Production
+==========
+
+
+.. toctree::
+ :maxdepth: 2
+
+ initial_production/initial_production
+ proofs/proofs
+ online_publication/online_publication
diff --git a/docs/guides/production/proofs/proofs.rst b/docs/guides/production/proofs/proofs.rst
new file mode 100644
index 0000000000000000000000000000000000000000..eb50aee6c46c9efee9501d5b8d840453564dabc4
--- /dev/null
+++ b/docs/guides/production/proofs/proofs.rst
@@ -0,0 +1,26 @@
+.. Howto for proofs
+
+Proofs
+======
+
+This guide is meant for **Production supervisors**. It describes the proofs cycle between production team and manuscript authors.
+
+
+Proofs version production
+-------------------------
+
+ * Once the paper has been properly formatted, the ``.tex`` and ``.pdf`` files
+ should be copied into new files carrying the ``_proofs_v[nr]`` suffix,
+ for example ``SciPost_Phys_1699_9999v9_Bee_proofs_v1.tex``.
+
+ * The ``.pdf`` proofs should be emailed to the authors for verification.
+ Authors should return either an annotated pdf or a list of corrections
+ by plain text email.
+
+ * Any modifications should be implemented directly in the main ``.tex`` file.
+
+ * If any further check by the authors are required, start this proofs
+ todo-list again, increasing the proofs version number.
+
+ * Once the authors have approved the proofs, the paper can be put forward
+ to online publication.
diff --git a/docs/contributors/editorial_administrators/submission_processing.rst b/docs/guides/submissions_processing/submissions_processing.rst
similarity index 100%
rename from docs/contributors/editorial_administrators/submission_processing.rst
rename to docs/guides/submissions_processing/submissions_processing.rst
diff --git a/docs/index.rst b/docs/index.rst
index 5b4a14377165a55f0ee5a0355ad9ec4095e357c9..a7922f3d586c4b8d1aa354b6ea660c1f1564ae5c 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -9,9 +9,10 @@ Welcome to SciPost's documentation!
Contents:
.. toctree::
- :maxdepth: 3
+ :maxdepth: 2
- contributors/contributors
+ roles/roles
+ guides/guides
developers/developers
diff --git a/docs/contributors/editorial_administrators/editorial_administrators.rst b/docs/roles/editorial/editorial_administrators.rst
similarity index 59%
rename from docs/contributors/editorial_administrators/editorial_administrators.rst
rename to docs/roles/editorial/editorial_administrators.rst
index 33e054b533e1a4951058019a0f2644e8622f11cd..d6747f7d357c5799fb77d8450dac71a258523b3d 100644
--- a/docs/contributors/editorial_administrators/editorial_administrators.rst
+++ b/docs/roles/editorial/editorial_administrators.rst
@@ -4,7 +4,3 @@ Editorial Administrators
.. toctree::
:maxdepth: 2
-
- submission_processing
- production
- maintenance
diff --git a/docs/roles/editorial/editorial_fellows.rst b/docs/roles/editorial/editorial_fellows.rst
new file mode 100644
index 0000000000000000000000000000000000000000..00973f28a2fff53aa8726ed59a63da0bc3fd0122
--- /dev/null
+++ b/docs/roles/editorial/editorial_fellows.rst
@@ -0,0 +1,6 @@
+Editorial Fellows
+=================
+
+
+.. toctree::
+ :maxdepth: 2
diff --git a/docs/roles/production/production_officers.rst b/docs/roles/production/production_officers.rst
new file mode 100644
index 0000000000000000000000000000000000000000..b9b79da1740c33ef7a2ca3c382e9a29a512985d6
--- /dev/null
+++ b/docs/roles/production/production_officers.rst
@@ -0,0 +1,6 @@
+Production Officers
+===================
+
+
+.. toctree::
+ :maxdepth: 2
diff --git a/docs/roles/roles.rst b/docs/roles/roles.rst
new file mode 100644
index 0000000000000000000000000000000000000000..3df3c2c3eda344d4ddf876bb4e6072a053f6321e
--- /dev/null
+++ b/docs/roles/roles.rst
@@ -0,0 +1,10 @@
+Roles: responsibilities and task lists
+======================================
+
+
+.. toctree::
+ :maxdepth: 2
+
+ editorial/editorial_administrators
+ editorial/editorial_fellows
+ production/production_officers
diff --git a/scipost/static/scipost/assets/css/_navbar.scss b/scipost/static/scipost/assets/css/_navbar.scss
index c9ca47fc15fc69689f38f779cc68b3a1ed8d1aa3..302993352ba812300a5f38972268bed0c3e2b81e 100644
--- a/scipost/static/scipost/assets/css/_navbar.scss
+++ b/scipost/static/scipost/assets/css/_navbar.scss
@@ -25,10 +25,6 @@
flex-direction: row;
}
- // .navbar-collapse.show .nav-item {
- // margin-bottom: .25rem;
- // }
-
.active > .nav-link {
border-color: $scipost-darkblue;
}
@@ -54,7 +50,7 @@
}
.form-inline {
- min-width: 250px;
+ min-width: 280px;
.form-control {
width: auto !important;
diff --git a/submissions/constants.py b/submissions/constants.py
index da15bf7acf1a8dbe0bcf274b62e3e41d00513f2a..ffb506708de9a0fddee0c601d6e2ca7f97007cf4 100644
--- a/submissions/constants.py
+++ b/submissions/constants.py
@@ -6,6 +6,9 @@ STATUS_AWAITING_ED_REC = 'awaiting_ed_rec'
STATUS_REVIEW_CLOSED = 'review_closed'
STATUS_ACCEPTED = 'accepted'
STATUS_PUBLISHED = 'published'
+STATUS_RESUBMITTED = 'resubmitted'
+STATUS_RESUBMITTED_REJECTED = 'resubmitted_and_rejected'
+STATUS_RESUBMITTED_REJECTED_VISIBLE = 'resubmitted_and_rejected_visible'
SUBMISSION_STATUS = (
(STATUS_UNASSIGNED, 'Unassigned, undergoing pre-screening'),
(STATUS_RESUBMISSION_INCOMING, 'Resubmission incoming'),
@@ -14,9 +17,9 @@ SUBMISSION_STATUS = (
(STATUS_REVIEW_CLOSED, 'Review period closed, editorial recommendation pending'),
# If revisions required: resubmission creates a new Submission object
(STATUS_REVISION_REQUESTED, 'Editor-in-charge has requested revision'),
- ('resubmitted', 'Has been resubmitted'),
- ('resubmitted_and_rejected', 'Has been resubmitted and subsequently rejected'),
- ('resubmitted_and_rejected_visible',
+ (STATUS_RESUBMITTED, 'Has been resubmitted'),
+ (STATUS_RESUBMITTED_REJECTED, 'Has been resubmitted and subsequently rejected'),
+ (STATUS_RESUBMITTED_REJECTED_VISIBLE,
'Has been resubmitted and subsequently rejected (still publicly visible)'),
# If acceptance/rejection:
('voting_in_preparation', 'Voting in preparation (eligible Fellows being selected)'),
diff --git a/submissions/factories.py b/submissions/factories.py
index da936a2e7a8fcbe4d2d9225a6d4a83f2b4f812da..39aab654c692e00a6518a5e7ecc633acf1b59f99 100644
--- a/submissions/factories.py
+++ b/submissions/factories.py
@@ -8,7 +8,7 @@ from journals.constants import SCIPOST_JOURNALS_DOMAINS
from common.helpers import random_arxiv_identifier_without_version_number, random_scipost_journal
from .constants import STATUS_UNASSIGNED, STATUS_EIC_ASSIGNED, STATUS_RESUBMISSION_INCOMING,\
- STATUS_PUBLISHED, SUBMISSION_TYPE
+ STATUS_PUBLISHED, SUBMISSION_TYPE, STATUS_RESUBMITTED
from .models import Submission
from faker import Faker
@@ -38,7 +38,7 @@ class SubmissionFactory(factory.django.DjangoModelFactory):
'''Fill empty arxiv fields.'''
self.arxiv_link = 'https://arxiv.org/abs/%s' % self.arxiv_identifier_wo_vn_nr
self.arxiv_identifier_w_vn_nr = '%sv1' % self.arxiv_identifier_wo_vn_nr
- self.arxiv_vn_nr = 1
+ self.arxiv_vn_nr = kwargs.get('arxiv_vn_nr', 1)
@factory.post_generation
def contributors(self, create, extracted, **kwargs):
@@ -71,9 +71,7 @@ class SubmissionFactory(factory.django.DjangoModelFactory):
class UnassignedSubmissionFactory(SubmissionFactory):
- '''
- This Submission is a 'new request' by a Contributor for its Submission.
- '''
+ '''This Submission is a 'new request' by a Contributor for its Submission.'''
status = STATUS_UNASSIGNED
@@ -92,18 +90,28 @@ class EICassignedSubmissionFactory(SubmissionFactory):
class ResubmittedSubmissionFactory(SubmissionFactory):
- '''
+ '''This Submission is a `resubmitted` version.'''
+ status = STATUS_RESUBMITTED
+ open_for_commenting = False
+ open_for_reporting = False
+ is_current = False
+ is_resubmission = False
+
+
+class ResubmissionFactory(SubmissionFactory):
+ """
This Submission is a newer version of a Submission which is
already known by the SciPost database.
- '''
+ """
status = STATUS_RESUBMISSION_INCOMING
open_for_commenting = True
open_for_reporting = True
is_resubmission = True
@factory.post_generation
- def alter_arxiv_fields(self, create, extracted, **kwargs):
- '''Alter arxiv fields to save as version 2.'''
+ def fill_arxiv_fields(self, create, extracted, **kwargs):
+ '''Fill empty arxiv fields.'''
+ self.arxiv_link = 'https://arxiv.org/abs/%s' % self.arxiv_identifier_wo_vn_nr
self.arxiv_identifier_w_vn_nr = '%sv2' % self.arxiv_identifier_wo_vn_nr
self.arxiv_vn_nr = 2
diff --git a/submissions/forms.py b/submissions/forms.py
index 73f7f6fe50718aec0e89944e9908b6edfbb26385..064196bd5764aaeefd18b791b0ae72ea1400d62f 100644
--- a/submissions/forms.py
+++ b/submissions/forms.py
@@ -2,7 +2,7 @@ from django import forms
from django.core.validators import RegexValidator
from .constants import ASSIGNMENT_BOOL, ASSIGNMENT_REFUSAL_REASONS,\
- REPORT_ACTION_CHOICES, REPORT_REFUSAL_CHOICES, SUBMISSION_CYCLES
+ REPORT_ACTION_CHOICES, REPORT_REFUSAL_CHOICES
from .models import Submission, RefereeInvitation, Report, EICRecommendation
from scipost.constants import SCIPOST_SUBJECT_AREAS
@@ -77,6 +77,30 @@ class SubmissionForm(forms.ModelForm):
'placeholder': 'Optional: names of referees whose reports should be treated with caution (+ short reason)',
'rows': 3})
+ def check_user_may_submit(self, current_user):
+ """
+ Important check!
+
+ The submitting user must be an author of the submission.
+ Also possibly may be extended to check permissions and give ultimate submission
+ power to certain user groups.
+ """
+ return current_user.last_name in self.cleaned_data['author_list']
+
+ def update_submission_data(self):
+ """
+ Some fields should not be accessible in the HTML form by the user and should be
+ inserted by for example an extra call to Arxiv into the Submission instance, right
+ *after* the form is submitted.
+
+ Example fields:
+ - is_resubmission
+ - arxiv_link
+ - arxiv_identifier_w_vn_nr
+ - metadata (!)
+ """
+ raise NotImplementedError
+
######################
# Editorial workflow #
diff --git a/submissions/managers.py b/submissions/managers.py
index ddff884029fae485b0589446aa9b947d341ee5cc..f1ce5d8a9ec241367cdfa27d31e7624bbea4c4ac 100644
--- a/submissions/managers.py
+++ b/submissions/managers.py
@@ -8,6 +8,22 @@ from .constants import SUBMISSION_STATUS_OUT_OF_POOL, SUBMISSION_STATUS_PUBLICLY
class SubmissionManager(models.Manager):
+ def _newest_version_only(self, queryset):
+ """
+ The current Queryset should return only the latest version
+ of the Arxiv submissions known to SciPost.
+
+ Method only compatible with PostGresQL
+ """
+ # This method used a double query, which is a consequence of the complex distinct()
+ # filter combined with the PostGresQL engine. Without the double query, ordering
+ # on a specific field after filtering would be impossible.
+ ids = (queryset
+ .order_by('arxiv_identifier_wo_vn_nr', '-arxiv_vn_nr')
+ .distinct('arxiv_identifier_wo_vn_nr')
+ .values_list('id', flat=True))
+ return queryset.filter(id__in=ids)
+
def user_filter(self, user):
"""
Prevent conflic of interest by filtering submissions possible related to user.
@@ -54,7 +70,8 @@ class SubmissionManager(models.Manager):
This query contains an overcomplete set of public submissions, i.e. also containing
submissions with status "published" or "resubmitted".
"""
- return self.exclude(status__in=SUBMISSION_STATUS_PUBLICLY_INVISIBLE)
+ queryset = self.exclude(status__in=SUBMISSION_STATUS_PUBLICLY_INVISIBLE)
+ return self._newest_version_only(queryset)
class EditorialAssignmentManager(models.Manager):
diff --git a/submissions/migrations/0043_auto_20170512_0836.py b/submissions/migrations/0043_auto_20170512_0836.py
new file mode 100644
index 0000000000000000000000000000000000000000..badd52ad60321186d16f52a6cb4ba9922e5cbb20
--- /dev/null
+++ b/submissions/migrations/0043_auto_20170512_0836.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-05-12 06:36
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('submissions', '0042_auto_20170511_2321'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='submission',
+ name='latest_activity',
+ field=models.DateTimeField(auto_now=True),
+ ),
+ ]
diff --git a/submissions/models.py b/submissions/models.py
index 787754332f0ecdd4c01c8b9685b499e84333b448..c2364962e70eeff53d55c6d22691d6e965131bb1 100644
--- a/submissions/models.py
+++ b/submissions/models.py
@@ -79,7 +79,7 @@ class Submission(ArxivCallable, models.Model):
# Metadata
metadata = JSONField(default={}, blank=True, null=True)
submission_date = models.DateField(verbose_name='submission date', default=datetime.date.today)
- latest_activity = models.DateTimeField(default=timezone.now)
+ latest_activity = models.DateTimeField(auto_now=True)
objects = SubmissionManager()
diff --git a/submissions/templates/submissions/new_submission.html b/submissions/templates/submissions/new_submission.html
index ba80d4cb1826f76836ba35354c8836d075c9e9dd..e0dbc27ad7279b3d3b2ead3ff73a8489c311fc5e 100644
--- a/submissions/templates/submissions/new_submission.html
+++ b/submissions/templates/submissions/new_submission.html
@@ -55,7 +55,7 @@ $(document).ready(function(){
<div class="col-12">
{% if perms.scipost.can_submit_manuscript %}
- {% if form.arxiv_link.value %}
+ {% if form.arxiv_link %}
<form id="full_submission_form" action="{% url 'submissions:submit_manuscript' %}" method="post">
{% csrf_token %}
{{form|bootstrap}}
diff --git a/submissions/test_utils.py b/submissions/test_utils.py
index 36f9a5ca7a3727542c52ff5345ea96dd197c8a3f..d070e6c8a4cf5ef81706d3b83344987f311425b0 100644
--- a/submissions/test_utils.py
+++ b/submissions/test_utils.py
@@ -9,7 +9,7 @@ from scipost.models import Contributor
from .constants import STATUS_UNASSIGNED, STATUS_RESUBMISSION_INCOMING, STATUS_AWAITING_ED_REC,\
STATUS_EIC_ASSIGNED, CYCLE_DEFAULT, CYCLE_DIRECT_REC
from .exceptions import CycleUpdateDeadlineError
-from .factories import UnassignedSubmissionFactory, ResubmittedSubmissionFactory
+from .factories import UnassignedSubmissionFactory, ResubmissionFactory
from .utils import GeneralSubmissionCycle
@@ -69,7 +69,7 @@ class TestResubmissionSubmissionCycle(TestCase):
self.submission_date = datetime.date.today()
add_groups_and_permissions()
ContributorFactory.create_batch(5)
- self.submission = ResubmittedSubmissionFactory(
+ self.submission = ResubmissionFactory(
dates__submission=self.submission_date
)
@@ -108,7 +108,7 @@ class TestResubmissionDirectSubmissionCycle(TestCase):
self.submission_date = datetime.date.today()
add_groups_and_permissions()
ContributorFactory.create_batch(5)
- self.submission = ResubmittedSubmissionFactory(
+ self.submission = ResubmissionFactory(
dates__submission=self.submission_date,
refereeing_cycle=CYCLE_DIRECT_REC
)
diff --git a/submissions/test_views.py b/submissions/test_views.py
index 8b797db80ccb9ddac353a6174482359509d428c3..11e9c210a19bd604c2791a96a4359d6f1c7672b4 100644
--- a/submissions/test_views.py
+++ b/submissions/test_views.py
@@ -1,59 +1,202 @@
+import json
+
+from django.core.urlresolvers import reverse
from django.test import TestCase
from django.test import Client
-from submissions.views import *
-import django.core.urlresolvers
-from .factories import EICassignedSubmissionFactory
+from common.helpers import random_arxiv_identifier_without_version_number
+from common.helpers.test import add_groups_and_permissions
+from scipost.factories import ContributorFactory
+# from scipost.models import Contributor
+
+from .constants import STATUS_UNASSIGNED
+from .factories import UnassignedSubmissionFactory, EICassignedSubmissionFactory,\
+ ResubmittedSubmissionFactory, ResubmissionFactory,\
+ PublishedSubmissionFactory
+from .forms import SubmissionForm, SubmissionIdentifierForm
+from .models import Submission
+
+# This is content of a real arxiv submission. As long as it isn't published it should
+# be possible to run tests using this submission.
+TEST_SUBMISSION = {
+ 'is_resubmission': False,
+ 'title': ('General solution of 2D and 3D superconducting quasiclassical'
+ ' systems:\n coalescing vortices and nanodisk geometries'),
+ 'author_list': 'Morten Amundsen, Jacob Linder',
+ 'arxiv_identifier_w_vn_nr': '1512.00030v1',
+ 'arxiv_identifier_wo_vn_nr': '1512.00030',
+ 'arxiv_vn_nr': 1,
+ 'arxiv_link': 'http://arxiv.org/abs/1512.00030v1',
+ 'abstract': ('In quasiclassical Keldysh theory, the Green function matrix $\\check{g}$'
+ ' is\nused to compute a variety of physical quantities in mesoscopic syst'
+ 'ems.\nHowever, solving the set of non-linear differential equations that'
+ ' provide\n$\\check{g}$ becomes a challenging task when going to higher s'
+ 'patial dimensions\nthan one. Such an extension is crucial in order to de'
+ 'scribe physical phenomena\nlike charge/spin Hall effects and topological'
+ ' excitations like vortices and\nskyrmions, none of which can be captured'
+ ' in one-dimensional models. We here\npresent a numerical finite element '
+ 'method which solves the 2D and 3D\nquasiclassical Usadel equation, witho'
+ 'ut any linearisation, relevant for the\ndiffusive regime. We show the ap'
+ 'plication of this on two model systems with\nnon-trivial geometries: (i)'
+ ' a bottlenecked Josephson junction with external\nflux and (ii) a nanodi'
+ 'sk ferromagnet deposited on top of a superconductor. We\ndemonstrate tha'
+ 't it is possible to control externally not only the geometrical\narray i'
+ 'n which superconducting vortices arrange themselves, but also to cause\n'
+ 'coalescence and thus tune the number of vortices. The finite element met'
+ 'hod\npresented herein could pave the way for gaining insight in physical'
+ ' phenomena\nwhich so far have remained largely unexplored due to the com'
+ 'plexity of solving\nthe full quasiclassical equations in higher dimensio'
+ 'ns.')
+}
+
+
+class BaseContributorTestCase(TestCase):
+ def setUp(self):
+ add_groups_and_permissions()
+ ContributorFactory.create_batch(5)
+ ContributorFactory.create(
+ user__last_name='Linder', # To pass the author check in create submissions view
+ user__username='Test',
+ user__password='testpw'
+ )
-class PrefillUsingIdentifierTest(TestCase):
- fixtures = ['permissions', 'groups', 'contributors']
+class PrefillUsingIdentifierTest(BaseContributorTestCase):
+ def setUp(self):
+ super().setUp()
+ self.client = Client()
+ self.url = reverse('submissions:prefill_using_identifier')
+ self.assertTrue(self.client.login(username="Test", password="testpw"))
- def test_retrieving_existing_arxiv_paper(self):
+ def test_basic_responses(self):
+ # Test anonymous client is rejected
client = Client()
- client.login(username="Test", password="testpw")
-
- response = client.post(reverse('submissions:prefill_using_identifier'),
- {'identifier': '1512.00030v1'})
+ response = client.get(self.url)
+ self.assertEqual(response.status_code, 403)
+ response = client.post(self.url,
+ {'identifier': TEST_SUBMISSION['arxiv_identifier_w_vn_nr']})
+ self.assertEqual(response.status_code, 403)
+
+ # Registered Contributor should get 200
+ response = self.client.get(self.url)
+ self.assertEqual(response.status_code, 200)
+ def test_retrieving_existing_arxiv_paper(self):
+ '''Test view with a valid post request.'''
+ response = self.client.post(self.url,
+ {'identifier':
+ TEST_SUBMISSION['arxiv_identifier_w_vn_nr']})
self.assertEqual(response.status_code, 200)
+ self.assertIsInstance(response.context['form'], SubmissionForm)
+ self.assertIsInstance(response.context['identifierform'], SubmissionIdentifierForm)
+ self.assertTrue(response.context['identifierform'].is_valid())
+
+ # Explicitly compare fields instead of assertDictEqual as metadata field may be outdated
+ self.assertEqual(TEST_SUBMISSION['is_resubmission'],
+ response.context['form'].initial['is_resubmission'])
+ self.assertEqual(TEST_SUBMISSION['title'], response.context['form'].initial['title'])
+ self.assertEqual(TEST_SUBMISSION['author_list'],
+ response.context['form'].initial['author_list'])
+ self.assertEqual(TEST_SUBMISSION['arxiv_identifier_w_vn_nr'],
+ response.context['form'].initial['arxiv_identifier_w_vn_nr'])
+ self.assertEqual(TEST_SUBMISSION['arxiv_identifier_wo_vn_nr'],
+ response.context['form'].initial['arxiv_identifier_wo_vn_nr'])
+ self.assertEqual(TEST_SUBMISSION['arxiv_vn_nr'],
+ response.context['form'].initial['arxiv_vn_nr'])
+ self.assertEqual(TEST_SUBMISSION['arxiv_link'],
+ response.context['form'].initial['arxiv_link'])
+ self.assertEqual(TEST_SUBMISSION['abstract'],
+ response.context['form'].initial['abstract'])
def test_still_200_ok_if_identifier_is_wrong(self):
- client = Client()
- client.login(username="Test", password="testpw")
-
- response = client.post(reverse('submissions:prefill_using_identifier'),
- {'identifier': '1512.00030'})
-
+ response = self.client.post(self.url, {'identifier': '1512.00030'})
self.assertEqual(response.status_code, 200)
-class SubmitManuscriptTest(TestCase):
- fixtures = ['permissions', 'groups', 'contributors']
-
+class SubmitManuscriptTest(BaseContributorTestCase):
def test_submit_correct_manuscript(self):
+ '''Check is view POST request works as expected.'''
client = Client()
- client.login(username="Test", password="testpw")
+ # Unauthorized request shouldn't be possible
response = client.post(reverse('submissions:prefill_using_identifier'),
- {'identifier': '1512.00030v1'})
-
- params = response.context['form'].initial
-
- extras = {'discipline': 'physics',
- 'submitted_to_journal': 'SciPost Physics',
- 'submission_type': 'Article',
- 'domain': 'T'}
- response = client.post(reverse('submissions:submit_manuscript'),
- {**params, **extras})
+ {'identifier': TEST_SUBMISSION['arxiv_identifier_w_vn_nr']})
+ self.assertEquals(response.status_code, 403)
+ # Registered Contributor should get 200; assuming prefiller is working properly
+ self.assertTrue(client.login(username="Test", password="testpw"))
+ response = client.post(reverse('submissions:prefill_using_identifier'),
+ {'identifier': TEST_SUBMISSION['arxiv_identifier_w_vn_nr']})
self.assertEqual(response.status_code, 200)
+ # Fill form parameters
+ params = response.context['form'].initial
+ params.update({
+ 'discipline': 'physics',
+ 'subject_area': 'Phys:MP',
+ 'submitted_to_journal': 'SciPostPhys',
+ 'submission_type': 'Article',
+ 'domain': 'T'
+ })
+ params['metadata'] = json.dumps(params['metadata'], separators=(',', ':'))
+
+ # Submit new Submission form
+ response = client.post(reverse('submissions:submit_manuscript'), params)
+ self.assertEqual(response.status_code, 302)
+
+ # Do a quick check on the Submission submitted.
+ submission = Submission.objects.filter(status=STATUS_UNASSIGNED).last()
+ self.assertIsNotNone(submission)
+ self.assertEqual(TEST_SUBMISSION['is_resubmission'], submission.is_resubmission)
+ self.assertEqual(TEST_SUBMISSION['title'], submission.title)
+ self.assertEqual(TEST_SUBMISSION['author_list'], submission.author_list)
+ self.assertEqual(TEST_SUBMISSION['arxiv_identifier_w_vn_nr'],
+ submission.arxiv_identifier_w_vn_nr)
+ self.assertEqual(TEST_SUBMISSION['arxiv_identifier_wo_vn_nr'],
+ submission.arxiv_identifier_wo_vn_nr)
+ self.assertEqual(TEST_SUBMISSION['arxiv_vn_nr'], submission.arxiv_vn_nr)
+ self.assertEqual(TEST_SUBMISSION['arxiv_link'], submission.arxiv_link)
+ self.assertEqual(TEST_SUBMISSION['abstract'], submission.abstract)
+
+ def test_non_author_tries_submission(self):
+ '''See what happens if a non-author of an Arxiv submission submits to SciPost.'''
+ client = Client()
-class SubmissionDetailTest(TestCase):
- fixtures = ['permissions', 'groups']
+ # Contributor Linder tries to submit the Quench Action.
+ # Eventually this call should already give an error. Waiting for
+ # Arxiv caller which is under construction [Jorran de Wit, 12 May 2017]
+ self.assertTrue(client.login(username="Test", password="testpw"))
+ response = client.post(reverse('submissions:prefill_using_identifier'),
+ {'identifier': '1603.04689v1'})
+ self.assertEqual(response.status_code, 200)
+ # Fill form parameters
+ params = response.context['form'].initial
+ params.update({
+ 'discipline': 'physics',
+ 'subject_area': 'Phys:MP',
+ 'submitted_to_journal': 'SciPostPhys',
+ 'submission_type': 'Article',
+ 'domain': 'T'
+ })
+ params['metadata'] = json.dumps(params['metadata'], separators=(',', ':'))
+
+ # Submit new Submission form
+ response = client.post(reverse('submissions:submit_manuscript'), params)
+ self.assertEqual(response.status_code, 302)
+
+ # No real check is done here to see if submission submit is aborted.
+ # To be implemented after Arxiv caller.
+ # Temporary fix:
+ last_submission = Submission.objects.last()
+ if last_submission:
+ self.assertNotEqual(last_submission.title, 'The Quench Action')
+ self.assertNotEqual(last_submission.arxiv_identifier_w_vn_nr, '1603.04689v1')
+
+
+class SubmissionDetailTest(BaseContributorTestCase):
def setUp(self):
+ super().setUp()
self.client = Client()
self.submission = EICassignedSubmissionFactory()
self.target = reverse(
@@ -64,3 +207,42 @@ class SubmissionDetailTest(TestCase):
def test_status_code_200(self):
response = self.client.get(self.target)
self.assertEqual(response.status_code, 200)
+
+
+class SubmissionListTest(BaseContributorTestCase):
+ def test_public_list_view(self):
+ # Create invisible Submissions.
+ arxiv_id_resubmission = random_arxiv_identifier_without_version_number()
+ UnassignedSubmissionFactory.create()
+ ResubmissionFactory.create(arxiv_identifier_wo_vn_nr=arxiv_id_resubmission)
+
+ # Create visible submissions
+ visible_submission_ids = []
+ visible_submission_ids.append(ResubmittedSubmissionFactory
+ .create(arxiv_identifier_wo_vn_nr=arxiv_id_resubmission).id)
+ visible_submission_ids.append(EICassignedSubmissionFactory.create().id)
+ visible_submission_ids.append(PublishedSubmissionFactory.create().id)
+
+ # Extra submission with multiple versions where the newest is publicly visible
+ # again. Earlier versions should therefore be invisible!
+ arxiv_id_resubmission = random_arxiv_identifier_without_version_number()
+ ResubmittedSubmissionFactory.create(arxiv_identifier_wo_vn_nr=arxiv_id_resubmission)
+ visible_submission_ids.append(
+ EICassignedSubmissionFactory.create(
+ arxiv_identifier_wo_vn_nr=arxiv_id_resubmission,
+ fill_arxiv_fields__arxiv_vn_nr=2
+ ).id
+ )
+
+ # Check with hardcoded URL as this url shouldn't change!
+ client = Client()
+ response = client.get('/submissions/')
+ self.assertEqual(response.status_code, 200)
+
+ # Check submissions returned
+ returned_submissions_ids = [sub.id for sub in response.context['object_list']]
+
+ # Check if submission lists are equal
+ returned_submissions_ids.sort()
+ visible_submission_ids.sort()
+ self.assertListEqual(returned_submissions_ids, visible_submission_ids)
diff --git a/submissions/views.py b/submissions/views.py
index ce94d8f6cecd0b88133cd1c32a4914b707cbaeff..343f58ca9da91d5d722fdb3474945019159328b1 100644
--- a/submissions/views.py
+++ b/submissions/views.py
@@ -109,28 +109,7 @@ class PrefillUsingIdentifierView(PermissionRequiredMixin, FormView):
class SubmissionCreateView(PermissionRequiredMixin, CreateView):
model = Submission
- fields = [
- 'is_resubmission',
- 'discipline',
- 'submitted_to_journal',
- 'submission_type',
- 'domain',
- 'subject_area',
- 'secondary_areas',
- 'title',
- 'author_list',
- 'abstract',
- 'arxiv_identifier_w_vn_nr',
- 'arxiv_identifier_wo_vn_nr',
- 'arxiv_vn_nr',
- 'arxiv_link',
- 'metadata',
- 'author_comments',
- 'list_of_changes',
- 'remarks_for_editors',
- 'referees_suggested',
- 'referees_flagged'
- ]
+ form_class = SubmissionForm
template_name = 'submissions/new_submission.html'
permission_required = 'scipost.can_submit_manuscript'
@@ -148,6 +127,15 @@ class SubmissionCreateView(PermissionRequiredMixin, CreateView):
submitted_by = Contributor.objects.get(user=self.request.user)
form.instance.submitted_by = submitted_by
+ # Temporary until moved to new Arxiv Caller
+ # Check submitting user for authorship !
+ # With the new Arxiv caller, this message should already be given in the prefil form!
+ if not form.check_user_may_submit(self.request.user):
+ msg = ('Your name does not match that of any of the authors. '
+ 'You are not authorized to submit this preprint.')
+ messages.error(self.request, msg)
+ return redirect('submissions:prefill_using_identifier')
+
# Save all the information contained in the form
submission = form.save()
@@ -203,7 +191,7 @@ class SubmissionListView(ListView):
paginate_by = 10
def get_queryset(self):
- queryset = Submission.objects.public_overcomplete().filter(is_current=True)
+ queryset = Submission.objects.public_overcomplete()
if 'to_journal' in self.kwargs:
queryset = queryset.filter(
latest_activity__gte=timezone.now() + datetime.timedelta(days=-60),