From 0de6066e78f01e6b7835437dc744bcb24ee9472b Mon Sep 17 00:00:00 2001 From: Ole Laursen Date: Tue, 8 Feb 2011 16:38:45 +0000 Subject: [PATCH] Hack the temporary login fix to support Secretariat people too - Legacy-Id: 2831 --- ietf/ietfauth/models.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ietf/ietfauth/models.py b/ietf/ietfauth/models.py index 080f9767b..59125912d 100644 --- a/ietf/ietfauth/models.py +++ b/ietf/ietfauth/models.py @@ -63,8 +63,17 @@ class IetfUserProfile(models.Model): def email(self): # quick hack to bind new and old schema together for the time being + try: + l = IESGLogin.objects.get(login_name=self.user.username) + if l.person: + person = l.person + else: + person = PersonOrOrgInfo.objects.get(first_name=l.first_name, + last_name=l.last_name) + except IESGLogin.DoesNotExist, PersonOrOrgInfo.DoesNotExist: + person = None from person.models import Email - return Email.objects.get(address=self.person().email()[1]) + return Email.objects.get(address=person.email()[1]) def __str__(self): return "IetfUserProfile(%s)" % (self.user,)