SciPost Code Repository

Skip to content
Snippets Groups Projects
Commit fa901e59 authored by Jean-Sébastien Caux's avatar Jean-Sébastien Caux
Browse files

Merge branch 'hotfix_JSC_20170602_adminforms'

parents 8be013c2 9b62938d
No related branches found
No related tags found
No related merge requests found
...@@ -9,10 +9,13 @@ from scipost.models import Contributor ...@@ -9,10 +9,13 @@ from scipost.models import Contributor
class CommentaryAdminForm(forms.ModelForm): class CommentaryAdminForm(forms.ModelForm):
authors = forms.ModelMultipleChoiceField( authors = forms.ModelMultipleChoiceField(
required=False,
queryset=Contributor.objects.order_by('user__last_name')) queryset=Contributor.objects.order_by('user__last_name'))
authors_claims = forms.ModelMultipleChoiceField( authors_claims = forms.ModelMultipleChoiceField(
required=False,
queryset=Contributor.objects.order_by('user__last_name')) queryset=Contributor.objects.order_by('user__last_name'))
authors_false_claims = forms.ModelMultipleChoiceField( authors_false_claims = forms.ModelMultipleChoiceField(
required=False,
queryset=Contributor.objects.order_by('user__last_name')) queryset=Contributor.objects.order_by('user__last_name'))
class Meta: class Meta:
......
...@@ -42,8 +42,10 @@ class PublicationAdminForm(forms.ModelForm): ...@@ -42,8 +42,10 @@ class PublicationAdminForm(forms.ModelForm):
authors = forms.ModelMultipleChoiceField( authors = forms.ModelMultipleChoiceField(
queryset=Contributor.objects.order_by('user__last_name')) queryset=Contributor.objects.order_by('user__last_name'))
authors_claims = forms.ModelMultipleChoiceField( authors_claims = forms.ModelMultipleChoiceField(
required=False,
queryset=Contributor.objects.order_by('user__last_name')) queryset=Contributor.objects.order_by('user__last_name'))
authors_false_claims = forms.ModelMultipleChoiceField( authors_false_claims = forms.ModelMultipleChoiceField(
required=False,
queryset=Contributor.objects.order_by('user__last_name')) queryset=Contributor.objects.order_by('user__last_name'))
class Meta: class Meta:
......
...@@ -86,6 +86,7 @@ def get_remark_type(remark): ...@@ -86,6 +86,7 @@ def get_remark_type(remark):
class RemarkAdminForm(forms.ModelForm): class RemarkAdminForm(forms.ModelForm):
submission = forms.ModelChoiceField( submission = forms.ModelChoiceField(
required=False,
queryset=Submission.objects.order_by('-arxiv_identifier_w_vn_nr')) queryset=Submission.objects.order_by('-arxiv_identifier_w_vn_nr'))
class Meta: class Meta:
...@@ -104,8 +105,10 @@ admin.site.register(Remark, RemarkAdmin) ...@@ -104,8 +105,10 @@ admin.site.register(Remark, RemarkAdmin)
class DraftInvitationAdminForm(forms.ModelForm): class DraftInvitationAdminForm(forms.ModelForm):
cited_in_submission = forms.ModelChoiceField( cited_in_submission = forms.ModelChoiceField(
required=False,
queryset=Submission.objects.order_by('-arxiv_identifier_w_vn_nr')) queryset=Submission.objects.order_by('-arxiv_identifier_w_vn_nr'))
cited_in_publication = forms.ModelChoiceField( cited_in_publication = forms.ModelChoiceField(
required=False,
queryset=Publication.objects.order_by('-publication_date')) queryset=Publication.objects.order_by('-publication_date'))
class Meta: class Meta:
...@@ -121,8 +124,10 @@ admin.site.register(DraftInvitation, DraftInvitationAdmin) ...@@ -121,8 +124,10 @@ admin.site.register(DraftInvitation, DraftInvitationAdmin)
class RegistrationInvitationAdminForm(forms.ModelForm): class RegistrationInvitationAdminForm(forms.ModelForm):
cited_in_submission = forms.ModelChoiceField( cited_in_submission = forms.ModelChoiceField(
required=False,
queryset=Submission.objects.order_by('-arxiv_identifier_w_vn_nr')) queryset=Submission.objects.order_by('-arxiv_identifier_w_vn_nr'))
cited_in_publication = forms.ModelChoiceField( cited_in_publication = forms.ModelChoiceField(
required=False,
queryset=Publication.objects.order_by('-publication_date')) queryset=Publication.objects.order_by('-publication_date'))
class Meta: class Meta:
......
...@@ -14,10 +14,13 @@ def submission_short_title(obj): ...@@ -14,10 +14,13 @@ def submission_short_title(obj):
class SubmissionAdminForm(forms.ModelForm): class SubmissionAdminForm(forms.ModelForm):
authors = forms.ModelMultipleChoiceField( authors = forms.ModelMultipleChoiceField(
required=False,
queryset=Contributor.objects.order_by('user__last_name')) queryset=Contributor.objects.order_by('user__last_name'))
authors_claims = forms.ModelMultipleChoiceField( authors_claims = forms.ModelMultipleChoiceField(
required=False,
queryset=Contributor.objects.order_by('user__last_name')) queryset=Contributor.objects.order_by('user__last_name'))
authors_false_claims = forms.ModelMultipleChoiceField( authors_false_claims = forms.ModelMultipleChoiceField(
required=False,
queryset=Contributor.objects.order_by('user__last_name')) queryset=Contributor.objects.order_by('user__last_name'))
class Meta: class Meta:
...@@ -102,18 +105,22 @@ class EICRecommendationAdminForm(forms.ModelForm): ...@@ -102,18 +105,22 @@ class EICRecommendationAdminForm(forms.ModelForm):
submission = forms.ModelChoiceField( submission = forms.ModelChoiceField(
queryset=Submission.objects.order_by('-arxiv_identifier_w_vn_nr')) queryset=Submission.objects.order_by('-arxiv_identifier_w_vn_nr'))
eligible_to_vote = forms.ModelMultipleChoiceField( eligible_to_vote = forms.ModelMultipleChoiceField(
required=False,
queryset=Contributor.objects.filter( queryset=Contributor.objects.filter(
user__groups__name__in=['Editorial College'], user__groups__name__in=['Editorial College'],
).order_by('user__last_name')) ).order_by('user__last_name'))
voted_for = forms.ModelMultipleChoiceField( voted_for = forms.ModelMultipleChoiceField(
required=False,
queryset=Contributor.objects.filter( queryset=Contributor.objects.filter(
user__groups__name__in=['Editorial College'], user__groups__name__in=['Editorial College'],
).order_by('user__last_name')) ).order_by('user__last_name'))
voted_against = forms.ModelMultipleChoiceField( voted_against = forms.ModelMultipleChoiceField(
required=False,
queryset=Contributor.objects.filter( queryset=Contributor.objects.filter(
user__groups__name__in=['Editorial College'], user__groups__name__in=['Editorial College'],
).order_by('user__last_name')) ).order_by('user__last_name'))
voted_abstain = forms.ModelMultipleChoiceField( voted_abstain = forms.ModelMultipleChoiceField(
required=False,
queryset=Contributor.objects.filter( queryset=Contributor.objects.filter(
user__groups__name__in=['Editorial College'], user__groups__name__in=['Editorial College'],
).order_by('user__last_name')) ).order_by('user__last_name'))
......
...@@ -9,10 +9,13 @@ from scipost.models import Contributor ...@@ -9,10 +9,13 @@ from scipost.models import Contributor
class ThesisLinkAdminForm(forms.ModelForm): class ThesisLinkAdminForm(forms.ModelForm):
author_claims = forms.ModelMultipleChoiceField( author_claims = forms.ModelMultipleChoiceField(
required=False,
queryset=Contributor.objects.order_by('user__last_name')) queryset=Contributor.objects.order_by('user__last_name'))
author_false_claims = forms.ModelMultipleChoiceField( author_false_claims = forms.ModelMultipleChoiceField(
required=False,
queryset=Contributor.objects.order_by('user__last_name')) queryset=Contributor.objects.order_by('user__last_name'))
supervisor_as_cont = forms.ModelMultipleChoiceField( supervisor_as_cont = forms.ModelMultipleChoiceField(
required=False,
queryset=Contributor.objects.order_by('user__last_name')) queryset=Contributor.objects.order_by('user__last_name'))
class Meta: class Meta:
......
...@@ -23,14 +23,17 @@ admin.site.register(Feedback, FeedbackAdmin) ...@@ -23,14 +23,17 @@ admin.site.register(Feedback, FeedbackAdmin)
class NominationAdminForm(forms.ModelForm): class NominationAdminForm(forms.ModelForm):
in_agreement = forms.ModelMultipleChoiceField( in_agreement = forms.ModelMultipleChoiceField(
required=False,
queryset=Contributor.objects.filter( queryset=Contributor.objects.filter(
user__groups__name__in=['Editorial College'], user__groups__name__in=['Editorial College'],
).order_by('user__last_name')) ).order_by('user__last_name'))
in_notsure = forms.ModelMultipleChoiceField( in_notsure = forms.ModelMultipleChoiceField(
required=False,
queryset=Contributor.objects.filter( queryset=Contributor.objects.filter(
user__groups__name__in=['Editorial College'], user__groups__name__in=['Editorial College'],
).order_by('user__last_name')) ).order_by('user__last_name'))
in_disagreement = forms.ModelMultipleChoiceField( in_disagreement = forms.ModelMultipleChoiceField(
required=False,
queryset=Contributor.objects.filter( queryset=Contributor.objects.filter(
user__groups__name__in=['Editorial College'], user__groups__name__in=['Editorial College'],
).order_by('user__last_name')) ).order_by('user__last_name'))
...@@ -48,14 +51,17 @@ admin.site.register(Nomination, NominationAdmin) ...@@ -48,14 +51,17 @@ admin.site.register(Nomination, NominationAdmin)
class MotionAdminForm(forms.ModelForm): class MotionAdminForm(forms.ModelForm):
in_agreement = forms.ModelMultipleChoiceField( in_agreement = forms.ModelMultipleChoiceField(
required=False,
queryset=Contributor.objects.filter( queryset=Contributor.objects.filter(
user__groups__name__in=['Editorial College'], user__groups__name__in=['Editorial College'],
).order_by('user__last_name')) ).order_by('user__last_name'))
in_notsure = forms.ModelMultipleChoiceField( in_notsure = forms.ModelMultipleChoiceField(
required=False,
queryset=Contributor.objects.filter( queryset=Contributor.objects.filter(
user__groups__name__in=['Editorial College'], user__groups__name__in=['Editorial College'],
).order_by('user__last_name')) ).order_by('user__last_name'))
in_disagreement = forms.ModelMultipleChoiceField( in_disagreement = forms.ModelMultipleChoiceField(
required=False,
queryset=Contributor.objects.filter( queryset=Contributor.objects.filter(
user__groups__name__in=['Editorial College'], user__groups__name__in=['Editorial College'],
).order_by('user__last_name')) ).order_by('user__last_name'))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment