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

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 ietf-tools#1034
 - Legacy-Id: 5714

Author: emiliosanchez

ietf/nomcom/forms.py

@@ -319,7 +319,7 @@ def __init__(self, *args, **kwargs):
 
     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 @@ def save(self):
         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 @@ def save(self, commit=True):
 
         # 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