External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-18 01:17:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

more consistent representations of model objects

Browse Source
This commit is contained in:
AlanCoding
2018-02-27 12:18:57 -05:00
parent 6d7f60ea61
commit bacd895705
4 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/models/base.py
View File

@@ -93,10 +93,10 @@ class BaseModel(models.Model):
abstract = True
def __unicode__(self):
if hasattr(self, 'name'):
return u'%s-%s' % (self.name, self.id)
if 'name' in self.__dict__:
return u'%s-%s' % (self.name, self.pk)
else:
return u'%s-%s' % (self._meta.verbose_name, self.id)
return u'%s-%s' % (self._meta.verbose_name, self.pk)
def clean_fields(self, exclude=None):
'''