diff --git a/preprints/models.py b/preprints/models.py index 29ed2450960e2dac4d010667bad39eaead266edf..773f4655f83b31fb288caaa466ca5d3fbd163152 100644 --- a/preprints/models.py +++ b/preprints/models.py @@ -51,6 +51,11 @@ class Preprint(models.Model): return "https://scipost.org%s" % self.get_absolute_url() return self.get_absolute_url().replace("/abs/", "/pdf/") + @property + def is_SciPost(self): + """Return True if this preprint is hosted on SciPost.""" + return 'scipost_' in self.identifier_w_vn_nr + @property def is_arXiv(self): """Return True if this preprint is hosted on arXiv.""" diff --git a/submissions/forms.py b/submissions/forms.py index ef23812c9c6c7a8f4d9801205be1fd1d2ffe6936..4f860387cb58cbb97d8a3ec815e40805043c60b6 100644 --- a/submissions/forms.py +++ b/submissions/forms.py @@ -554,6 +554,7 @@ class SubmissionForm(forms.ModelForm): preprint_file = forms.FileField( help_text=('Please submit the processed .pdf (not the source files; ' 'these will only be required at the post-acceptance proofs stage)')) + arxiv_link = forms.URLField(label='arXiv link (including version nr)') class Meta: model = Submission @@ -575,7 +576,6 @@ class SubmissionForm(forms.ModelForm): 'remarks_for_editors', 'referees_suggested', 'referees_flagged', - 'arxiv_link', ] widgets = { 'is_resubmission_of': forms.HiddenInput(), diff --git a/submissions/migrations/0086_auto_20200720_1333.py b/submissions/migrations/0086_auto_20200720_1333.py new file mode 100644 index 0000000000000000000000000000000000000000..63b94633972da608d7d22a4cdf3e5f167a559b71 --- /dev/null +++ b/submissions/migrations/0086_auto_20200720_1333.py @@ -0,0 +1,25 @@ +# Generated by Django 2.2.11 on 2020-07-20 11:33 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('submissions', '0085_auto_20200720_0648'), + ] + + operations = [ + migrations.RemoveField( + model_name='submission', + name='arxiv_identifier_w_vn_nr', + ), + migrations.RemoveField( + model_name='submission', + name='arxiv_identifier_wo_vn_nr', + ), + migrations.RemoveField( + model_name='submission', + name='arxiv_vn_nr', + ), + ] diff --git a/submissions/migrations/0087_remove_submission_arxiv_link.py b/submissions/migrations/0087_remove_submission_arxiv_link.py new file mode 100644 index 0000000000000000000000000000000000000000..6b44cf97739861dc6a329051d37547724b459491 --- /dev/null +++ b/submissions/migrations/0087_remove_submission_arxiv_link.py @@ -0,0 +1,17 @@ +# Generated by Django 2.2.11 on 2020-07-20 11:54 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('submissions', '0086_auto_20200720_1333'), + ] + + operations = [ + migrations.RemoveField( + model_name='submission', + name='arxiv_link', + ), + ] diff --git a/submissions/models/submission.py b/submissions/models/submission.py index 9686aaddc2a82433c91c841bd11d579914b210c6..e8f1a45ef878e2fe30790054ccb1f76f534dd30f 100644 --- a/submissions/models/submission.py +++ b/submissions/models/submission.py @@ -112,12 +112,6 @@ class Submission(models.Model): 'submissions.iThenticateReport', on_delete=models.SET_NULL, null=True, blank=True, related_name='to_submission') - # Arxiv identifiers with/without version number - arxiv_identifier_w_vn_nr = models.CharField(max_length=15, default='0000.00000v0') - arxiv_identifier_wo_vn_nr = models.CharField(max_length=10, default='0000.00000') - arxiv_vn_nr = models.PositiveSmallIntegerField(default=1) - arxiv_link = models.URLField(verbose_name='arXiv link (including version nr)') - pdf_refereeing_pack = models.FileField(upload_to='UPLOADS/REFEREE/%Y/%m/', max_length=200, blank=True)