Minor polishing of admin interface.

gracedb/admin.py

-#from gracedb.gracedb.models import Analysis, Group, User
+
 from models import Event, EventLog, User, Group
 from models import Label, Labelling
 from django.contrib import admin
 
-#class AnalysisAdmin(admin.ModelAdmin):
-#    list_display = ['uid', 'group', 'analysisType', 'description', 'owner']
+class EventAdmin(admin.ModelAdmin):
+    def analysis_type(obj):
+        return obj.get_analysisType_display()
+    analysis_type.admin_order_field = 'analysisType'
+
+    def graceid(obj):
+        return obj.graceid()
+    graceid.admin_order_field = 'id'
+
+    list_display = [ graceid, 'group', analysis_type, 'submitter'  ]
+    search_fields = [ 'group__name', 'submitter__name' ]
+
+class UserAdmin(admin.ModelAdmin):
+    list_display = [ 'name', 'dn' ]
+    search_fields = [ 'name' ]
+
+class LabelAdmin(admin.ModelAdmin):
+    list_display = [ 'name', 'defaultColor' ]
+
+class EventLogAdmin(admin.ModelAdmin):
+    list_display = [ 'event', 'issuer', 'filename', 'comment' ]
+    search_fields = [ 'event__id', 'issuer__name', 'filename', 'comment']
+
+class LabellingAdmin(admin.ModelAdmin):
+    list_display = [ 'event', 'label', 'creator' ]
+    search_fields = [ 'event__id', 'label__name', 'creator__name' ]
 
-#admin.site.register(Analysis, AnalysisAdmin)
-admin.site.register(Event)
-admin.site.register(EventLog)
-admin.site.register(User)
+admin.site.register(Event, EventAdmin)
+admin.site.register(EventLog, EventLogAdmin)
+admin.site.register(User, UserAdmin)
 admin.site.register(Group)
-admin.site.register(Label)
-admin.site.register(Labelling)
+admin.site.register(Label, LabelAdmin)
+admin.site.register(Labelling, LabellingAdmin)
 

gracedb/models.py

@@ -145,6 +145,9 @@ class Event(models.Model):
             raise cls.DoesNotExist()
         return e
 
+    def __unicode__(self):
+        return self.graceid()
+
 class EventLog(models.Model):
     class Meta:
         ordering = ["-created"]