summaryrefslogtreecommitdiff
path: root/coip/extensions
diff options
context:
space:
mode:
authorJohan Berggren <jbn@nordu.net>2011-03-04 14:38:19 +0100
committerJohan Berggren <jbn@nordu.net>2011-03-04 14:38:19 +0100
commit613ab889ea717c86cda5b61332027581d6eb61e8 (patch)
treef46c11bc3bdb97e5fcdd7c8c0c470cf7d28bec29 /coip/extensions
parent07a04353ebacf6769683b55694d5aa78139d1d4f (diff)
parentf0dd7b2469b6d276fdfdc0a0dc4da5101ce272cc (diff)
Merge branch 'master' of git.nordu.net:coip
Diffstat (limited to 'coip/extensions')
-rw-r--r--coip/extensions/templatetags/permdisplay.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/coip/extensions/templatetags/permdisplay.py b/coip/extensions/templatetags/permdisplay.py
index 23e6ed3..3928094 100644
--- a/coip/extensions/templatetags/permdisplay.py
+++ b/coip/extensions/templatetags/permdisplay.py
@@ -25,7 +25,7 @@ permdisplay.is_safe = True
register.filter(permdisplay)
def acldstdisplay(dst):
- if dst.display.startswith("user:"):
+ if dst.display.startswith("user:") and dst.display.count(":") == 1:
(pfx,username) = split(dst.display,":",1)
user = User.objects.get(username=username)
if user:
@@ -33,7 +33,7 @@ def acldstdisplay(dst):
else:
return "Unknown user \"%s\"" % username
else:
- return "Members of <a class=\"tip\" title=\"%s\" href=\"/name/id/%d\">%s</a>" % (dst.display,dst.id,dst.short)
+ return "members of %s (%s)" % (dst.short,dst.display)
acldstdisplay.is_safe = True