matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add anonymous user support to the 'get_object_name' function

Browse Source
This commit is contained in:
Roberto Rosario
2012-01-07 23:33:09 -04:00
parent 4931d9bf49
commit c7ee18af85
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/common/utils.py
View File

@@ -13,6 +13,7 @@ from django.conf import settings
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.contrib.auth.models import AnonymousUser
def urlquote(link=None, get=None): def urlquote(link=None, get=None):
@@ -333,9 +334,15 @@ def get_object_name(obj, display_object_type=True):
label = unicode(obj) label = unicode(obj)
if isinstance(obj, User): if isinstance(obj, User):
label = obj.get_full_name() if obj.get_full_name() else obj label = obj.get_full_name() if obj.get_full_name() else obj
elif isinstance(obj, AnonymousUser):
label = _(u'Anonymous user')
if display_object_type: if display_object_type:
verbose_name = unicode(getattr(obj._meta, u'verbose_name', ct_label)) try:
verbose_name = unicode(obj._meta.verbose_name)
except AttributeError:
verbose_name = ct_label
return u'%s: %s' % (verbose_name, label) return u'%s: %s' % (verbose_name, label)
else: else:
return u'%s' % (label) return u'%s' % (label)