one: more detailed User admin

one/admin.py

@@ -23,17 +23,30 @@ class DetailsInline(contrib.admin.StackedInline):
     can_delete = False
     can_delete = False
 
 
 class MyUserAdmin(contrib.auth.admin.UserAdmin):
 class MyUserAdmin(contrib.auth.admin.UserAdmin):
-    list_display = ('username', 'full_name', 'email', 'date_joined', 'instance_count')
+    list_display = ('username', 'full_name', 'email', 'date_joined', 'instance_count', 'course_groups')
+    list_filter = ('is_superuser', 'is_active', 'groups', 'person__course_groups', )
+
     try:
     try:
         inlines = inlines + (PersonInline, SshKeyInline, DetailsInline)
         inlines = inlines + (PersonInline, SshKeyInline, DetailsInline)
     except NameError:
     except NameError:
         inlines = (PersonInline, SshKeyInline, DetailsInline)
         inlines = (PersonInline, SshKeyInline, DetailsInline)
+
     def instance_count(self, obj):
     def instance_count(self, obj):
-        return obj.instance_set.count()
+        return _("%d (%d active)") % (obj.instance_set.count(),
+                obj.instance_set.filter(state='ACTIVE').count(), )
+
+    def course_groups(self, obj):
+        try:
+            return ", ".join(obj.person_set.all()[0].course_groups.all())
+        except:
+            return None
+
     def full_name(self, obj):
     def full_name(self, obj):
         return u"%s %s" % (obj.last_name, obj.first_name)
         return u"%s %s" % (obj.last_name, obj.first_name)
     full_name.admin_order_field = 'last_name'
     full_name.admin_order_field = 'last_name'
 
 
+    ordering = ["-date_joined"]
+
 
 
 
 
 contrib.admin.site.unregister(contrib.auth.models.User)
 contrib.admin.site.unregister(contrib.auth.models.User)