Merge branch 'archweb-generic'

1 files changed, 7 insertions, 1 deletions

diff --git a/devel/admin.py b/devel/admin.py
index c8f80f95..d1729fe3 100644
--- a/devel/admin.py
+++ b/devel/admin.py
@@ -2,7 +2,7 @@ from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin
 from django.contrib.auth.models import User
 
-from .models import UserProfile, MasterKey, DeveloperKey, PGPSignature
+from .models import UserProfile, StaffGroup, MasterKey, DeveloperKey, PGPSignature
 
 
 class UserProfileInline(admin.StackedInline):
@@ -15,6 +15,11 @@ class UserProfileAdmin(UserAdmin):
     list_filter = ('is_staff', 'is_superuser', 'is_active')
 
 
+class StaffGroupAdmin(admin.ModelAdmin):
+    list_display = ('name', 'group', 'sort_order', 'member_title', 'slug')
+    prepopulated_fields = {'slug': ('name',)}
+
+
 class MasterKeyAdmin(admin.ModelAdmin):
     list_display = ('pgp_key', 'owner', 'created', 'revoker', 'revoked')
     search_fields = ('pgp_key', 'owner__username', 'revoker__username')
@@ -36,6 +41,7 @@ class PGPSignatureAdmin(admin.ModelAdmin):
 
 admin.site.unregister(User)
 admin.site.register(User, UserProfileAdmin)
+admin.site.register(StaffGroup, StaffGroupAdmin)
 
 admin.site.register(MasterKey, MasterKeyAdmin)
 admin.site.register(DeveloperKey, DeveloperKeyAdmin)