diff --git a/commentaries/admin.py b/commentaries/admin.py index 441d0f229c0eaf8bbba274a5402a9ee888b6c31c..93aee6375bdb1b36584042765d5e5220d7d1ca0e 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 dc98d36072c7fd63e5dd98d2c67e8836d53f7b07..8c82762bbe9cb7df533f9aec127ecb2ca1328fe7 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 dc4ef69f237f2511068edde40147e41eb3d2e9d5..5db931f3ef878d4e7cd3e23cd82a5ed1e2964acb 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 1cac3e6107410e539ede53109214ecfee3bda976..10fa602e0f82a198e68d393f362720d504addee9 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 3fc5fd571457f533b471b6d379c129356a943d4f..762043c8deb4a77bade074668e87e1417f9c3db0 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 61bf7ab92665dd958f36e3b97756996c3924c80e..6baf0995ccc27f01638926563db60ed849deebda 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'))