diff --git a/submissions/views.py b/submissions/views.py index 8e6375aed27c13db5c50d7cdd25f590fd16e11c7..910111727e53c20365c6c237e4d32318ac0d038c 100644 --- a/submissions/views.py +++ b/submissions/views.py @@ -445,10 +445,6 @@ def assign_submission(request, arxiv_identifier_w_vn_nr): arxiv_identifier_w_vn_nr=arxiv_identifier_w_vn_nr) form = EditorialAssignmentForm(request.POST or None, submission=submission) - fellows_with_expertise = submission.fellows.filter( - contributor__expertises__contains=[submission.subject_area]) - coauthorships = submission.flag_coauthorships_arxiv(fellows_with_expertise) - if form.is_valid(): ed_assignment = form.save() SubmissionUtils.load({'assignment': ed_assignment}) @@ -456,6 +452,10 @@ def assign_submission(request, arxiv_identifier_w_vn_nr): messages.success(request, 'Your assignment request has been sent successfully.') return redirect('submissions:pool') + fellows_with_expertise = submission.fellows.filter( + contributor__expertises__contains=[submission.subject_area]) + coauthorships = submission.flag_coauthorships_arxiv(fellows_with_expertise) + context = { 'submission_to_assign': submission, 'fellows_with_expertise': fellows_with_expertise, @@ -1396,10 +1396,6 @@ def prepare_for_voting(request, rec_id): recommendation = get_object_or_404( EICRecommendation.objects.active().filter(submission__in=submissions), id=rec_id) - fellows_with_expertise = recommendation.submission.fellows.filter( - contributor__expertises__contains=[recommendation.submission.subject_area]) - - coauthorships = {} eligibility_form = VotingEligibilityForm(request.POST or None, instance=recommendation) if eligibility_form.is_valid(): eligibility_form.save() @@ -1412,6 +1408,8 @@ def prepare_for_voting(request, rec_id): return redirect(reverse('submissions:editorial_page', args=[recommendation.submission.arxiv_identifier_w_vn_nr])) else: + fellows_with_expertise = recommendation.submission.fellows.filter( + contributor__expertises__contains=[recommendation.submission.subject_area]) coauthorships = recommendation.submission.flag_coauthorships_arxiv(fellows_with_expertise) context = {