SciPost Code Repository

Skip to content
Snippets Groups Projects
Commit 06da1e9d authored by Jorran de Wit's avatar Jorran de Wit
Browse files

Improve commentaries.forms PEP

parent f9379ec0
No related branches found
No related tags found
No related merge requests found
...@@ -47,7 +47,7 @@ class RequestCommentaryForm(forms.ModelForm): ...@@ -47,7 +47,7 @@ class RequestCommentaryForm(forms.ModelForm):
# Either Arxiv-ID or DOI is given # Either Arxiv-ID or DOI is given
if not cleaned_data['arxiv_identifier'] and not cleaned_data['pub_DOI']: if not cleaned_data['arxiv_identifier'] and not cleaned_data['pub_DOI']:
msg = ('You must provide either a DOI (for a published paper) ' msg = ('You must provide either a DOI (for a published paper) '
'or an arXiv identifier (for a preprint).') 'or an arXiv identifier (for a preprint).')
self.add_error('arxiv_identifier', msg) self.add_error('arxiv_identifier', msg)
self.add_error('pub_DOI', msg) self.add_error('pub_DOI', msg)
elif (cleaned_data['arxiv_identifier'] and elif (cleaned_data['arxiv_identifier'] and
...@@ -61,14 +61,14 @@ class RequestCommentaryForm(forms.ModelForm): ...@@ -61,14 +61,14 @@ class RequestCommentaryForm(forms.ModelForm):
elif (cleaned_data['pub_DOI'] and elif (cleaned_data['pub_DOI'] and
Commentary.objects.filter(pub_DOI=cleaned_data['pub_DOI']).exists()): Commentary.objects.filter(pub_DOI=cleaned_data['pub_DOI']).exists()):
msg = 'There already exists a Commentary Page on this publication, see' msg = 'There already exists a Commentary Page on this publication, see'
self.existing_commentary = get_object_or_404(Commentary, pub_DOI=cleaned_data['pub_DOI']) self.existing_commentary = get_object_or_404(
Commentary, pub_DOI=cleaned_data['pub_DOI'])
self.add_error('pub_DOI', msg) self.add_error('pub_DOI', msg)
# Current user is not known # Current user is not known
if not self.user or not Contributor.objects.filter(user=self.user).exists(): if not self.user or not Contributor.objects.filter(user=self.user).exists():
self.add_error(None, 'Sorry, current user is not known to SciPost.') self.add_error(None, 'Sorry, current user is not known to SciPost.')
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
"""Prefill instance before save""" """Prefill instance before save"""
self.instance.requested_by = Contributor.objects.get(user=self.user) self.instance.requested_by = Contributor.objects.get(user=self.user)
...@@ -135,7 +135,8 @@ class VetCommentaryForm(forms.Form): ...@@ -135,7 +135,8 @@ class VetCommentaryForm(forms.Form):
self.add_error(None, 'No `commentary_id` provided') self.add_error(None, 'No `commentary_id` provided')
return cleaned_data return cleaned_data
else: else:
self.commentary = Commentary.objects.select_related('requested_by__user').get(pk=self.commentary_id) self.commentary = Commentary.objects.select_related('requested_by__user').get(
pk=self.commentary_id)
# Check valid `user` # Check valid `user`
if not self.user: if not self.user:
...@@ -149,7 +150,7 @@ class VetCommentaryForm(forms.Form): ...@@ -149,7 +150,7 @@ class VetCommentaryForm(forms.Form):
"""Raise ValueError if form isn't validated""" """Raise ValueError if form isn't validated"""
if not self.is_cleaned: if not self.is_cleaned:
raise ValueError(('VetCommentaryForm could not be processed ' raise ValueError(('VetCommentaryForm could not be processed '
'because the data didn\'t validate')) 'because the data didn\'t validate'))
def get_commentary(self): def get_commentary(self):
"""Return Commentary if available""" """Return Commentary if available"""
......
import factory import factory
from django.contrib.auth import get_user_model from django.contrib.auth import get_user_model
from django.contrib.auth.models import Group, User from django.contrib.auth.models import Group
from .models import Contributor from .models import Contributor
......
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