From 9b62938d4c8d54a29abe5a60a03abbaf2e676451 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Fri, 2 Jun 2017 12:16:14 +0200
Subject: [PATCH] Correct admin forms for all apps: required=False where needed
---
commentaries/admin.py | 3 +++
journals/admin.py | 2 ++
scipost/admin.py | 5 +++++
submissions/admin.py | 7 +++++++
theses/admin.py | 3 +++
virtualmeetings/admin.py | 6 ++++++
6 files changed, 26 insertions(+)
diff --git a/commentaries/admin.py b/commentaries/admin.py
index 441d0f229..93aee6375 100644
--- a/commentaries/admin.py
+++ b/commentaries/admin.py
@@ -9,10 +9,13 @@ from scipost.models import Contributor
class CommentaryAdminForm(forms.ModelForm):
authors = forms.ModelMultipleChoiceField(
+ required=False,
queryset=Contributor.objects.order_by('user__last_name'))
authors_claims = forms.ModelMultipleChoiceField(
+ required=False,
queryset=Contributor.objects.order_by('user__last_name'))
authors_false_claims = forms.ModelMultipleChoiceField(
+ required=False,
queryset=Contributor.objects.order_by('user__last_name'))
class Meta:
diff --git a/journals/admin.py b/journals/admin.py
index dc98d3607..8c82762bb 100644
--- a/journals/admin.py
+++ b/journals/admin.py
@@ -42,8 +42,10 @@ class PublicationAdminForm(forms.ModelForm):
authors = forms.ModelMultipleChoiceField(
queryset=Contributor.objects.order_by('user__last_name'))
authors_claims = forms.ModelMultipleChoiceField(
+ required=False,
queryset=Contributor.objects.order_by('user__last_name'))
authors_false_claims = forms.ModelMultipleChoiceField(
+ required=False,
queryset=Contributor.objects.order_by('user__last_name'))
class Meta:
diff --git a/scipost/admin.py b/scipost/admin.py
index dc4ef69f2..5db931f3e 100644
--- a/scipost/admin.py
+++ b/scipost/admin.py
@@ -86,6 +86,7 @@ def get_remark_type(remark):
class RemarkAdminForm(forms.ModelForm):
submission = forms.ModelChoiceField(
+ required=False,
queryset=Submission.objects.order_by('-arxiv_identifier_w_vn_nr'))
class Meta:
@@ -104,8 +105,10 @@ admin.site.register(Remark, RemarkAdmin)
class DraftInvitationAdminForm(forms.ModelForm):
cited_in_submission = forms.ModelChoiceField(
+ required=False,
queryset=Submission.objects.order_by('-arxiv_identifier_w_vn_nr'))
cited_in_publication = forms.ModelChoiceField(
+ required=False,
queryset=Publication.objects.order_by('-publication_date'))
class Meta:
@@ -121,8 +124,10 @@ admin.site.register(DraftInvitation, DraftInvitationAdmin)
class RegistrationInvitationAdminForm(forms.ModelForm):
cited_in_submission = forms.ModelChoiceField(
+ required=False,
queryset=Submission.objects.order_by('-arxiv_identifier_w_vn_nr'))
cited_in_publication = forms.ModelChoiceField(
+ required=False,
queryset=Publication.objects.order_by('-publication_date'))
class Meta:
diff --git a/submissions/admin.py b/submissions/admin.py
index 1cac3e610..10fa602e0 100644
--- a/submissions/admin.py
+++ b/submissions/admin.py
@@ -14,10 +14,13 @@ def submission_short_title(obj):
class SubmissionAdminForm(forms.ModelForm):
authors = forms.ModelMultipleChoiceField(
+ required=False,
queryset=Contributor.objects.order_by('user__last_name'))
authors_claims = forms.ModelMultipleChoiceField(
+ required=False,
queryset=Contributor.objects.order_by('user__last_name'))
authors_false_claims = forms.ModelMultipleChoiceField(
+ required=False,
queryset=Contributor.objects.order_by('user__last_name'))
class Meta:
@@ -102,18 +105,22 @@ class EICRecommendationAdminForm(forms.ModelForm):
submission = forms.ModelChoiceField(
queryset=Submission.objects.order_by('-arxiv_identifier_w_vn_nr'))
eligible_to_vote = forms.ModelMultipleChoiceField(
+ required=False,
queryset=Contributor.objects.filter(
user__groups__name__in=['Editorial College'],
).order_by('user__last_name'))
voted_for = forms.ModelMultipleChoiceField(
+ required=False,
queryset=Contributor.objects.filter(
user__groups__name__in=['Editorial College'],
).order_by('user__last_name'))
voted_against = forms.ModelMultipleChoiceField(
+ required=False,
queryset=Contributor.objects.filter(
user__groups__name__in=['Editorial College'],
).order_by('user__last_name'))
voted_abstain = forms.ModelMultipleChoiceField(
+ required=False,
queryset=Contributor.objects.filter(
user__groups__name__in=['Editorial College'],
).order_by('user__last_name'))
diff --git a/theses/admin.py b/theses/admin.py
index 3fc5fd571..762043c8d 100644
--- a/theses/admin.py
+++ b/theses/admin.py
@@ -9,10 +9,13 @@ from scipost.models import Contributor
class ThesisLinkAdminForm(forms.ModelForm):
author_claims = forms.ModelMultipleChoiceField(
+ required=False,
queryset=Contributor.objects.order_by('user__last_name'))
author_false_claims = forms.ModelMultipleChoiceField(
+ required=False,
queryset=Contributor.objects.order_by('user__last_name'))
supervisor_as_cont = forms.ModelMultipleChoiceField(
+ required=False,
queryset=Contributor.objects.order_by('user__last_name'))
class Meta:
diff --git a/virtualmeetings/admin.py b/virtualmeetings/admin.py
index 61bf7ab92..6baf0995c 100644
--- a/virtualmeetings/admin.py
+++ b/virtualmeetings/admin.py
@@ -23,14 +23,17 @@ admin.site.register(Feedback, FeedbackAdmin)
class NominationAdminForm(forms.ModelForm):
in_agreement = forms.ModelMultipleChoiceField(
+ required=False,
queryset=Contributor.objects.filter(
user__groups__name__in=['Editorial College'],
).order_by('user__last_name'))
in_notsure = forms.ModelMultipleChoiceField(
+ required=False,
queryset=Contributor.objects.filter(
user__groups__name__in=['Editorial College'],
).order_by('user__last_name'))
in_disagreement = forms.ModelMultipleChoiceField(
+ required=False,
queryset=Contributor.objects.filter(
user__groups__name__in=['Editorial College'],
).order_by('user__last_name'))
@@ -48,14 +51,17 @@ admin.site.register(Nomination, NominationAdmin)
class MotionAdminForm(forms.ModelForm):
in_agreement = forms.ModelMultipleChoiceField(
+ required=False,
queryset=Contributor.objects.filter(
user__groups__name__in=['Editorial College'],
).order_by('user__last_name'))
in_notsure = forms.ModelMultipleChoiceField(
+ required=False,
queryset=Contributor.objects.filter(
user__groups__name__in=['Editorial College'],
).order_by('user__last_name'))
in_disagreement = forms.ModelMultipleChoiceField(
+ required=False,
queryset=Contributor.objects.filter(
user__groups__name__in=['Editorial College'],
).order_by('user__last_name'))
--
GitLab