From 958271a65e1c8e7f711e62bb6733f7a473d4b7c2 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Thu, 11 Apr 2019 06:13:35 +0200
Subject: [PATCH] Remove deprec Nominations and Motions from contributor merge
form
---
scipost/forms.py | 24 ------------------------
1 file changed, 24 deletions(-)
diff --git a/scipost/forms.py b/scipost/forms.py
index 0669fb5b5..c213787df 100644
--- a/scipost/forms.py
+++ b/scipost/forms.py
@@ -645,30 +645,6 @@ class ContributorMergeForm(forms.Form):
for tl in thesislinks:
tl.supervisor_as_cont.remove(contrib_from)
tl.supervisor_as_cont.add(contrib_into)
- nominations = Nomination.objects.filter(in_agreement__in=[contrib_from,]).all()
- for nom in nominations:
- nom.in_agreement.remove(contrib_from)
- nom.in_agreement.add(contrib_into)
- nominations = Nomination.objects.filter(in_notsure__in=[contrib_from,]).all()
- for nom in nominations:
- nom.in_notsure.remove(contrib_from)
- nom.in_notsure.add(contrib_into)
- nominations = Nomination.objects.filter(in_disagreement__in=[contrib_from,]).all()
- for nom in nominations:
- nom.in_disagreement.remove(contrib_from)
- nom.in_disagreement.add(contrib_into)
- motions = Motion.objects.filter(in_agreement__in=[contrib_from,]).all()
- for nom in motions:
- nom.in_agreement.remove(contrib_from)
- nom.in_agreement.add(contrib_into)
- motions = Motion.objects.filter(in_notsure__in=[contrib_from,]).all()
- for nom in motions:
- nom.in_notsure.remove(contrib_from)
- nom.in_notsure.add(contrib_into)
- motions = Motion.objects.filter(in_disagreement__in=[contrib_from,]).all()
- for nom in motions:
- nom.in_disagreement.remove(contrib_from)
- nom.in_disagreement.add(contrib_into)
# If both accounts were active, inform the Contributor of the merge
if both_contribs_active:
mail_sender = DirectMailUtil(
--
GitLab