mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code

Fixes #385: Corrected Unicode rendering of UserAction

Browse Source
This commit is contained in:
Jeremy Stretch
2016-07-26 09:11:35 -04:00
parent bd6e68fe6c
commit e5b19a9374
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/extras/models.py
View File

@ -176,8 +176,8 @@ class UserAction(models.Model):
def __unicode__(self):
if self.message:
return ' '.join([self.user, self.message])
return ' '.join([self.user, self.get_action_display(), self.content_type])
return u'{} {}'.format(self.user, self.message)
return u'{} {} {}'.format(self.user, self.get_action_display(), self.content_type)
def icon(self):
if self.action in [ACTION_CREATE, ACTION_IMPORT]: