summaryrefslogtreecommitdiff
path: root/coip/extensions
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2011-08-18 10:41:41 +0200
committerLeif Johansson <leifj@sunet.se>2011-08-18 10:41:41 +0200
commit8b62502983ca646104f22ecb56cf97ff8922756a (patch)
tree6dea14dea1b13a8fdb919d9ada7f10a816876131 /coip/extensions
parent9d4561febd0489eb8cab1fc3654614b1a5ed17ac (diff)
new profile-model
Diffstat (limited to 'coip/extensions')
-rw-r--r--coip/extensions/templatetags/userdisplay.py27
1 files changed, 9 insertions, 18 deletions
diff --git a/coip/extensions/templatetags/userdisplay.py b/coip/extensions/templatetags/userdisplay.py
index de6f363..e1f7fd0 100644
--- a/coip/extensions/templatetags/userdisplay.py
+++ b/coip/extensions/templatetags/userdisplay.py
@@ -1,6 +1,4 @@
from django import template
-from django.template import defaultfilters
-from coip.apps.userprofile.models import last_used_profile
from pprint import pformat
import logging
@@ -10,27 +8,20 @@ MOMENT = 120 # duration in seconds within which the time difference
# will be rendered as 'a moment ago'
def userdisplay(user):
- try:
- p = last_used_profile(user)
- return p.display_name
- except Exception,e:
- logging.warning(e)
+ if user == None:
+ return "anonymous"
+ profile = user.get_profile()
+ if profile and profile.display_name:
+ return profile.display_name
+ cn = user.get_full_name()
+ if cn:
+ return cn
+ else:
return user.username
userdisplay.is_safe = True
register.filter(userdisplay)
-def lastidentifier(user):
- #try:
- p = last_used_profile(user)
- return p.identifier
- #except Exception,e:
- # pprint(e)
- # return user.username
-
-lastidentifier.is_safe = True
-register.filter(lastidentifier)
-
def memberdisplay(membership):
if membership.user:
return userdisplay(membership.user)