From 2f3fc9b9f63859a43adf2f9e0295a4e2660855b5 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Fri, 10 Jul 2020 12:47:47 +0200
Subject: [PATCH] Restrict submission's set of Fellows to those with expertise
overlap
---
submissions/forms.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/submissions/forms.py b/submissions/forms.py
index f240a45c2..4eab83d8f 100644
--- a/submissions/forms.py
+++ b/submissions/forms.py
@@ -491,7 +491,10 @@ class SubmissionForm(forms.ModelForm):
"""
qs = Fellowship.objects.active()
fellows = qs.regular().filter(
- contributor__discipline=submission.discipline).return_active_for_submission(submission)
+ contributor__profile__discipline=submission.discipline).filter(
+ Q(contributor__profile__expertises__contains=[submission.subject_area]) |
+ Q(contributor__profile__expertises__overlap=submission.secondary_areas)
+ ).return_active_for_submission(submission)
submission.fellows.set(fellows)
if submission.proceedings:
--
GitLab