summaryrefslogtreecommitdiff
path: root/main/admin.py
diff options
context:
space:
mode:
authorDusty Phillips <dusty@gerolde.archlinux.org>2009-08-12 17:33:42 -0400
committerDusty Phillips <dusty@gerolde.archlinux.org>2009-08-12 17:33:42 -0400
commitffeec245afedb79953995cbb02dbe2746d13fc94 (patch)
tree3f49bc54efbde2df0a6a4438f8f95c3e308e5f87 /main/admin.py
parent6bcf9709f20db8b8e3e40c16b20448f3899f3624 (diff)
parent88d83dfaa66d6a01621dcff61b441babdf4833ce (diff)
Merge branch 'master' of /srv/projects/git/archweb_dev
Diffstat (limited to 'main/admin.py')
-rw-r--r--main/admin.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/main/admin.py b/main/admin.py
index 20532090..fc482f44 100644
--- a/main/admin.py
+++ b/main/admin.py
@@ -53,7 +53,7 @@ class MirrorRsyncInlineAdmin(admin.TabularInline):
extra = 2
class MirrorAdmin(admin.ModelAdmin):
- list_display = ('name', 'country', 'active', 'public', 'isos', 'notes')
+ list_display = ('name', 'country', 'active', 'public', 'isos', 'notes', 'admin_email', 'supported_protocols')
list_filter = ('country', 'active', 'public')
ordering = ['country', 'name']
search_fields = ('name',)
@@ -79,6 +79,8 @@ class UserProfileInline(admin.StackedInline):
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')
admin.site.register(User, UserProfileAdmin)