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

Remove AnonymousUser class checking

Browse Source
This commit is contained in:
Roberto Rosario
2012-01-08 06:49:26 -04:00
parent fac43006e3
commit 14dbeb4266
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/common/utils.py
View File

@@ -1,4 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import absolute_import
import os import os
import re import re
import types import types
@@ -13,7 +15,6 @@ 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):
@@ -331,11 +332,10 @@ def generate_choices_w_labels(choices, display_object_type=True):
def get_object_name(obj, display_object_type=True): def get_object_name(obj, display_object_type=True):
ct_label = ContentType.objects.get_for_model(obj).name ct_label = ContentType.objects.get_for_model(obj).name
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): else:
label = _(u'Anonymous user') label = unicode(obj)
if display_object_type: if display_object_type:
try: try: