Merge branch 'master' of https://github.com/isb-cgc/ISB-CGC-Common in…

…to isb-cgc-test
isb-cgc · Aug 8, 2016 · 92a720c · 92a720c
2 parents 890f59c + 554741a
commit 92a720c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/accounts/admin.py b/accounts/admin.py
@@ -66,7 +66,12 @@ class ServiceAccountAdmin(admin.ModelAdmin):
 
 @admin.register(AuthorizedDataset)
 class AuthorizedDatasetAdmin(admin.ModelAdmin):
-    pass
+    list_display = (
+        'name',
+        'whitelist_id',
+        'acl_google_group',
+        'public'
+    )
 
 admin.site.register(NIH_User, NIH_UserAdmin)
 admin.site.register(Bucket, BucketAdmin)

diff --git a/accounts/models.py b/accounts/models.py
@@ -62,6 +62,9 @@ class AuthorizedDataset(models.Model):
     acl_google_group = models.CharField(max_length=256, null=False)
     public = models.BooleanField(default=False)
 
+    def __str__(self):
+        return self.name
+
 
 class UserAuthorizedDatasets(models.Model):
     nih_user = models.ForeignKey(NIH_User, null=False)