summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2011-04-05 12:46:58 +0200
committerLeif Johansson <leifj@sunet.se>2011-04-05 12:46:58 +0200
commit97b507a12ed8aa8440ce91883673357d4e8f724b (patch)
tree11ca9ddc3f492742415728f163fd0f510335236e
parent838b9d6fdbb9112ee70a72b8846f739e8a3b8879 (diff)
pull in fn and ln just in case
-rw-r--r--src/meetingtools/apps/auth/views.py9
1 files changed, 4 insertions, 5 deletions
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