Adjust to handle the slightly revamped email_address() on person

 - Legacy-Id: 3750

Author: OleLaursen

ietf/liaisons/accountsREDESIGN.py

@@ -35,7 +35,7 @@ def get_person_for_user(user):
         return None
     try:
         p = user.get_profile()
-        p.email = lambda: (p.name, p.email_address().address)
+        p.email = lambda: (p.name, p.email_address())
         return p
     except Person.DoesNotExist:
         return None

ietf/liaisons/formsREDESIGN.py

@@ -255,7 +255,9 @@ def save_extra_fields(self, liaison):
         from_entity = self.get_from_entity()
         liaison.from_name = from_entity.name
         liaison.from_group = from_entity.obj
-        liaison.from_contact = self.cleaned_data["person"].email_address()
+        e = self.cleaned_data["person"].email_set.order_by('-active')
+        if e:
+            liaison.from_contact = e[0]
 
         organization = self.get_to_entity()
         liaison.to_name = organization.name

ietf/liaisons/tests.py

@@ -260,7 +260,7 @@ def test_add_incoming_liaison(self):
 
         l = LiaisonStatement.objects.all().order_by("-id")[0]
         self.assertEquals(l.from_group, from_group)
-        self.assertEquals(l.from_contact, submitter.email_address())
+        self.assertEquals(l.from_contact.address, submitter.email_address())
         self.assertEquals(l.reply_to, "replyto@example.com")
         self.assertEquals(l.to_group, to_group)
         self.assertEquals(l.response_contact, "responce_contact@example.com")
@@ -333,7 +333,7 @@ def test_add_outgoing_liaison(self):
 
         l = LiaisonStatement.objects.all().order_by("-id")[0]
         self.assertEquals(l.from_group, from_group)
-        self.assertEquals(l.from_contact, submitter.email_address())
+        self.assertEquals(l.from_contact.address, submitter.email_address())
         self.assertEquals(l.reply_to, "replyto@example.com")
         self.assertEquals(l.to_group, to_group)
         self.assertEquals(l.to_contact, "to_poc@example.com")

ietf/submit/tests.py

@@ -216,7 +216,7 @@ def test_submit_existing(self):
         self.assertTrue(name in unicode(outbox[-2]))
         self.assertTrue("mars" in unicode(outbox[-2]))
         self.assertTrue(draft.ad.role_email("ad").address in unicode(outbox[-2]))
-        self.assertTrue(ballot_position.ad.email_address().address in unicode(outbox[-2]))
+        self.assertTrue(ballot_position.ad.email_address() in unicode(outbox[-2]))
         self.assertTrue("New Version Notification" in outbox[-1]["Subject"])
         self.assertTrue(name in unicode(outbox[-1]))
         self.assertTrue("mars" in unicode(outbox[-1]))

redesign/importing/import-liaison.py

@@ -153,7 +153,7 @@ def lookup_group(**kwargs):
         try:
             l.from_contact = Email.objects.get(address__iexact=o.from_email().address)
         except EmailAddress.DoesNotExist:
-            l.from_contact = old_person_to_person(o.person).email_address()
+            l.from_contact = old_person_to_person(o.person).email_set.order_by('-active')[0]
 
     if o.by_secretariat:
         l.to_name = o.submitter_name