Merge tag 'release_2012-04-21'

Migrations, moving code around, random small improvements

1 files changed, 17 insertions, 1 deletions

diff --git a/devel/admin.py b/devel/admin.py
index 717ba1b2..5a704c0b 100644
--- a/devel/admin.py
+++ b/devel/admin.py
@@ -1,6 +1,18 @@
 from django.contrib import admin
+from django.contrib.auth.admin import UserAdmin
+from django.contrib.auth.models import User
 
-from .models import MasterKey, PGPSignature
+from .models import UserProfile, MasterKey, PGPSignature
+
+
+class UserProfileInline(admin.StackedInline):
+    model = UserProfile
+
+
+class UserProfileAdmin(UserAdmin):
+    inlines = [UserProfileInline]
+    list_display = ('username', 'email', 'first_name', 'last_name', 'is_staff', 'is_active')
+    list_filter = ('is_staff', 'is_superuser', 'is_active')
 
 
 class MasterKeyAdmin(admin.ModelAdmin):
@@ -8,6 +20,7 @@ class MasterKeyAdmin(admin.ModelAdmin):
     search_fields = ('pgp_key', 'owner', 'revoker')
     date_hierarchy = 'created'
 
+
 class PGPSignatureAdmin(admin.ModelAdmin):
     list_display = ('signer', 'signee', 'created', 'expires', 'valid')
     list_filter = ('valid',)
@@ -15,6 +28,9 @@ class PGPSignatureAdmin(admin.ModelAdmin):
     date_hierarchy = 'created'
 
 
+admin.site.unregister(User)
+admin.site.register(User, UserProfileAdmin)
+
 admin.site.register(MasterKey, MasterKeyAdmin)
 admin.site.register(PGPSignature, PGPSignatureAdmin)