From ed385fac1218f9eadf62e2c8c631ba3a0d593358 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Thu, 15 Nov 2018 10:09:27 +0100
Subject: [PATCH] Hotfix two bugs in the submitmanuscript form

---
 submissions/forms.py  | 2 +-
 submissions/models.py | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/submissions/forms.py b/submissions/forms.py
index 064a6615d..ecce7bf13 100644
--- a/submissions/forms.py
+++ b/submissions/forms.py
@@ -331,7 +331,7 @@ class RequestSubmissionForm(SubmissionChecks, forms.ModelForm):
         self.fields['proceedings'].empty_label = None
         if not qs.exists():
             # No proceedings issue to submit to, so adapt the form fields
-            self.fields['submitted_to'].queryset = self.fields['submitted_to'].exclude(
+            self.fields['submitted_to'].queryset = self.fields['submitted_to'].queryset.exclude(
                 doi_label=SCIPOST_JOURNAL_PHYSICS_PROC)
             del self.fields['proceedings']
 
diff --git a/submissions/models.py b/submissions/models.py
index ea7c57afc..40e541a3f 100644
--- a/submissions/models.py
+++ b/submissions/models.py
@@ -90,8 +90,7 @@ class Submission(models.Model):
     voting_fellows = models.ManyToManyField('colleges.Fellowship', blank=True,
                                             related_name='voting_pool')
 
-    submitted_to = models.ForeignKey('journals.Journal', on_delete=models.CASCADE,
-                                     blank=True, null=True)
+    submitted_to = models.ForeignKey('journals.Journal', on_delete=models.CASCADE)
     proceedings = models.ForeignKey('proceedings.Proceedings', null=True, blank=True,
                                     related_name='submissions')
     title = models.CharField(max_length=300)
-- 
GitLab