Merge pull request #97 from Humanitec/coregroup-str

update CoreGroup str method and admin
buildlyio · May 8, 2019 · 004b450 · 004b450
2 parents 0ed04db + 16c904e
commit 004b450
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/workflow/admin.py b/workflow/admin.py
@@ -28,7 +28,7 @@ class OrganizationAdmin(admin.ModelAdmin):
 
 
 class CoreGroupAdmin(admin.ModelAdmin):
-    list_display = ('name',)
+    list_display = ('name', 'organization', 'is_global', 'is_org_level', 'is_default', 'permissions')
     display = 'Core Group'
     search_fields = ('name',)
 

diff --git a/workflow/models.py b/workflow/models.py
@@ -156,7 +156,7 @@ class Meta:
         ordering = ('name',)
 
     def __str__(self):
-        return self.name
+        return f'{self.name} <{self.organization}>'
 
     def save(self, *args, **kwargs):
         self.edit_date = timezone.now()