From 97b507a12ed8aa8440ce91883673357d4e8f724b Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Tue, 5 Apr 2011 12:46:58 +0200 Subject: pull in fn and ln just in case --- src/meetingtools/apps/auth/views.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/meetingtools/apps/auth/views.py b/src/meetingtools/apps/auth/views.py index d74377a..bbeb4be 100644 --- a/src/meetingtools/apps/auth/views.py +++ b/src/meetingtools/apps/auth/views.py @@ -57,15 +57,14 @@ def accounts_login_federated(request): profile.save() update = False + fn = meta1(request,'givenName') + ln = meta1(request,'sn') cn = meta1(request,'cn') if not cn: cn = meta1(request,'displayName') logging.warn(cn) - if not cn: - fn = meta1(request,'givenName') - ln = meta1(request,'sn') - if fn and ln: - cn = "%s %s" % (fn,ln) + if not cn and fn and ln: + cn = "%s %s" % (fn,ln) if not cn: cn = profile.identifier -- cgit v1.1