diff --git a/scipost/models.py b/scipost/models.py index 7703b1b8ee8929dedb9f00f2da765f3eb5d28fc4..4fd2fd3ee7dfb0f1e8478c9e88eee8c49b3ad486 100644 --- a/scipost/models.py +++ b/scipost/models.py @@ -120,28 +120,21 @@ class Contributor(models.Model): """Check if Contributor is currently not marked as unavailable.""" return not self.unavailability_periods.today().exists() - def is_SP_Admin(self): + def is_sp_admin(self): """Check if Contributor is a SciPost Administrator.""" return (self.user.groups.filter(name='SciPost Administrators').exists() or self.user.is_superuser) - def is_Fin_Admin(self): - """ - Check if Contributor is a SciPost Financial Administrator. - """ - return (self.user.groups.filter(name='Financial Administrators').exists() - or self.user.is_superuser) - - def is_EdCol_Admin(self): + def is_ed_admin(self): """Check if Contributor is an Editorial Administrator.""" return (self.user.groups.filter(name='Editorial Administrators').exists() or self.user.is_superuser) - def is_MEC(self): + def is_active_fellow(self): """Check if Contributor is a member of the Editorial College.""" return self.fellowships.active().exists() or self.user.is_superuser - def is_VE(self): + def is_vetting_editor(self): """Check if Contributor is a Vetting Editor.""" return (self.user.groups.filter(name='Vetting Editors').exists() or self.user.is_superuser) diff --git a/scipost/templates/partials/scipost/personal_page/editorial_actions.html b/scipost/templates/partials/scipost/personal_page/editorial_actions.html index f1d8a10d81e02ab97aab850f0035a10a6e29841e..171832ee64dba0378ce8c7bf867b4d8c36e7577b 100644 --- a/scipost/templates/partials/scipost/personal_page/editorial_actions.html +++ b/scipost/templates/partials/scipost/personal_page/editorial_actions.html @@ -55,7 +55,7 @@ </div> - {% if perms.scipost.can_oversee_refereeing or request.user.contributor.is_MEC %} + {% if perms.scipost.can_oversee_refereeing or request.user.contributor.is_active_fellow %} <div class="col-md-4"> <h3>Info</h3> <ul> @@ -70,7 +70,7 @@ {% if perms.scipost.can_assign_submissions %} <li>Assign Submissions via the <a href="{% url 'submissions:pool' %}">Submissions Pool</a> ({{ nr_submissions_to_assign }})</li> {% endif %} - {% if request.user.contributor.is_MEC %} + {% if request.user.contributor.is_active_fellow %} <li>Accept or decline assignments via the <a href="{% url 'submissions:pool' %}">Submissions Pool</a> ({{ nr_assignments_to_consider }})</li> {% endif %} </ul> diff --git a/scipost/views.py b/scipost/views.py index 63327561e2b68e17a824975b8471ed05ee434491..d0c7c9368065e93d4b1ff70f0174d235444147a6 100644 --- a/scipost/views.py +++ b/scipost/views.py @@ -657,7 +657,7 @@ def _personal_page_admin_actions(request): context = {} contributor = request.user.contributor - if contributor.is_SP_Admin(): + if contributor.is_sp_admin(): # count the number of pending registration requests context['nr_reg_to_vet'] = Contributor.objects.awaiting_vetting().count() context['nr_reg_awaiting_validation'] = Contributor.objects.awaiting_validation().count() @@ -677,7 +677,7 @@ def _personal_page_editorial_actions(request): 'Editorial College', 'Vetting Editors', 'Junior Ambassadors']).exists() or request.user.is_superuser - permission = permission or request.user.contributor.is_MEC() + permission = permission or request.user.contributor.is_active_fellow() if not permission: raise PermissionDenied @@ -685,25 +685,25 @@ def _personal_page_editorial_actions(request): context = {} contributor = request.user.contributor - if contributor.is_SP_Admin(): + if contributor.is_sp_admin(): context['nr_submissions_to_assign'] = Submission.objects.prescreening().count() context['nr_recommendations_to_prepare_for_voting'] = \ EICRecommendation.objects.voting_in_preparation().count() - if contributor.is_VE(): + if contributor.is_vetting_editor(): context['nr_commentary_page_requests_to_vet'] = (Commentary.objects.awaiting_vetting() .exclude(requested_by=contributor).count()) context['nr_comments_to_vet'] = Comment.objects.awaiting_vetting().count() context['nr_thesislink_requests_to_vet'] = ThesisLink.objects.awaiting_vetting().count() context['nr_authorship_claims_to_vet'] = AuthorshipClaim.objects.awaiting_vetting().count() - if contributor.is_MEC(): + if contributor.is_active_fellow(): context['nr_assignments_to_consider'] = contributor.editorial_assignments.invited().count() context['active_assignments'] = contributor.editorial_assignments.ongoing() context['nr_reports_to_vet'] = Report.objects.awaiting_vetting().filter( submission__editor_in_charge=contributor).count() - if contributor.is_EdCol_Admin(): + if contributor.is_ed_admin(): context['nr_reports_without_pdf'] = Report.objects.accepted().filter(pdf_report='').count() context['nr_treated_submissions_without_pdf'] = Submission.objects.treated().public().filter( pdf_refereeing_pack='').count()