From bacd895705ba25f540fd3fb09645b392c20a43dc Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Tue, 27 Feb 2018 12:18:57 -0500
Subject: [PATCH] more consistent representations of model objects

---
 awx/main/models/base.py         | 6 +++---
 awx/main/models/inventory.py    | 6 ------
 awx/main/models/organization.py | 3 ---
 awx/main/models/rbac.py         | 6 ++++++
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/awx/main/models/base.py b/awx/main/models/base.py
index 08c9562806..7639bc4548 100644
--- a/awx/main/models/base.py
+++ b/awx/main/models/base.py
@@ -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):
         '''
diff --git a/awx/main/models/inventory.py b/awx/main/models/inventory.py
index eda2557a35..32a6557a89 100644
--- a/awx/main/models/inventory.py
+++ b/awx/main/models/inventory.py
@@ -596,9 +596,6 @@ class Host(CommonModelNameNotUnique):
 
     objects = HostManager()
 
-    def __unicode__(self):
-        return self.name
-
     def get_absolute_url(self, request=None):
         return reverse('api:host_detail', kwargs={'pk': self.pk}, request=request)
 
@@ -768,9 +765,6 @@ class Group(CommonModelNameNotUnique):
         help_text=_('Inventory source(s) that created or modified this group.'),
     )
 
-    def __unicode__(self):
-        return self.name
-
     def get_absolute_url(self, request=None):
         return reverse('api:group_detail', kwargs={'pk': self.pk}, request=request)
 
diff --git a/awx/main/models/organization.py b/awx/main/models/organization.py
index 8ec785a0c8..a4c90da131 100644
--- a/awx/main/models/organization.py
+++ b/awx/main/models/organization.py
@@ -80,9 +80,6 @@ class Organization(CommonModel, NotificationFieldsModel, ResourceMixin, CustomVi
     def get_absolute_url(self, request=None):
         return reverse('api:organization_detail', kwargs={'pk': self.pk}, request=request)
 
-    def __unicode__(self):
-        return self.name
-
 
 class Team(CommonModelNameNotUnique, ResourceMixin):
     '''
diff --git a/awx/main/models/rbac.py b/awx/main/models/rbac.py
index 930b226ac6..d6822213ab 100644
--- a/awx/main/models/rbac.py
+++ b/awx/main/models/rbac.py
@@ -153,6 +153,12 @@ class Role(models.Model):
     object_id = models.PositiveIntegerField(null=True, default=None)
     content_object = GenericForeignKey('content_type', 'object_id')
 
+    def __unicode__(self):
+        if 'role_field' in self.__dict__:
+            return u'%s-%s' % (self.name, self.pk)
+        else:
+            return u'%s-%s' % (self._meta.verbose_name, self.pk)
+
     def save(self, *args, **kwargs):
         super(Role, self).save(*args, **kwargs)
         self.rebuild_role_ancestor_list([self.id], [])