altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Add new nominations to the primary address of existing merged nominations.

Browse source 
Allow to enter a secondary address in the primary address of the merge form and the merge is done into the primary address of the secondary address (tongue-twister).
Fixes #1034
 - Legacy-Id: 5714
This commit is contained in:
Emilio A. Sánchez López 2013-05-09 09:02:34 +00:00
parent 3cbdecd3c3
commit ad5c2ddae9
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ietf/nomcom/forms.py
View file

@ -319,7 +319,7 @@ class MergeForm(BaseNomcomForm, forms.Form):
def clean_primary_email(self):
email = self.cleaned_data['primary_email']
nominees = Nominee.objects.get_by_nomcom(self.nomcom).not_duplicated().filter(email__address=email)
nominees = Nominee.objects.get_by_nomcom(self.nomcom).filter(email__address=email)
if not nominees:
msg = "Does not exist a nomiee with this email"
self._errors["primary_email"] = self.error_class([msg])
@ -352,6 +352,8 @@ class MergeForm(BaseNomcomForm, forms.Form):
secondary_emails = get_list(self.cleaned_data.get("secondary_emails"))
primary_nominee = Nominee.objects.get_by_nomcom(self.nomcom).get(email__address=primary_email)
while primary_nominee.duplicated:
primary_nominee = primary_nominee.duplicated
secondary_nominees = Nominee.objects.get_by_nomcom(self.nomcom).filter(email__address__in=secondary_emails)
for nominee in secondary_nominees:
# move nominations
@ -451,6 +453,8 @@ class NominateForm(BaseNomcomForm, forms.ModelForm):
# Add the nomination for a particular position
nominee, created = Nominee.objects.get_or_create(email=email, nomcom=self.nomcom)
while nominee.duplicated:
nominee = nominee.duplicated
nominee_position, nominee_position_created = NomineePosition.objects.get_or_create(position=position, nominee=nominee)
# Complete nomination data