diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-12-12 20:24:30 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-12-12 20:24:30 -0500 |
commit | f9ae4f860ccf57e84032d7be9426331a9e06e979 (patch) | |
tree | c9d837d7e2750d22ba9049abc7cf3c4125f0c9e4 /main/admin.py | |
parent | 6c5c3355a97d35afb7f1eee284966ad0bf8cee3b (diff) | |
parent | 206000df736fde75a49c3178a8522d17f30a955e (diff) |
Merge tag 'release_2012-04-21'
Migrations, moving code around, random small improvements
Diffstat (limited to 'main/admin.py')
-rw-r--r-- | main/admin.py | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/main/admin.py b/main/admin.py index 783d07e4..741f6665 100644 --- a/main/admin.py +++ b/main/admin.py @@ -1,7 +1,5 @@ from django.contrib import admin -from django.contrib.auth.models import User -from django.contrib.auth.admin import UserAdmin -from main.models import Arch, Donor, Package, Repo, Todolist, UserProfile +from main.models import Arch, Donor, Package, Repo, Todolist class DonorAdmin(admin.ModelAdmin): list_display = ('name', 'visible', 'created') @@ -31,17 +29,7 @@ class TodolistAdmin(admin.ModelAdmin): list_display = ('name', 'date_added', 'creator', 'description') search_fields = ('name', 'description') -admin.site.unregister(User) -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') - - -admin.site.register(User, UserProfileAdmin) admin.site.register(Donor, DonorAdmin) admin.site.register(Package, PackageAdmin) |