lance/edbob
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add some __unicode__() methods

Browse source
This commit is contained in:
Lance Edgar 2012-11-21 10:05:24 -08:00
parent 7928461e08
commit a1d22df20c
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
edbob/db/extensions/auth/model.py
View file

@ -53,8 +53,8 @@ class Permission(Base):
def __repr__(self): def __repr__(self):
return "<Permission: %s, %s>" % (self.role, self.permission) return "<Permission: %s, %s>" % (self.role, self.permission)
def __str__(self): def __unicode__(self):
return str(self.permission or '') return unicode(self.permission or '')
class UserRole(Base): class UserRole(Base):
@ -99,8 +99,8 @@ class Role(Base):
def __repr__(self): def __repr__(self):
return "<Role: %s>" % self.name return "<Role: %s>" % self.name
def __str__(self): def __unicode__(self):
return str(self.name or '') return unicode(self.name or '')
class User(Base): class User(Base):
@ -126,15 +126,16 @@ class User(Base):
def __repr__(self): def __repr__(self):
return "<User: %s>" % self.username return "<User: %s>" % self.username
def __str__(self): def __unicode__(self):
return str(self.username or '') return unicode(self.username or '')
@property @property
def display_name(self): def display_name(self):
""" """
Returns the user's ``person.display_name``, if present, otherwise the Returns :attr:`Person.display_name` if present; otherwise returns
``username``. :attr:`username`.
""" """
if self.person and self.person.display_name: if self.person and self.person.display_name:
return self.person.display_name return self.person.display_name
return self.username return self.username