From d21d8be0186413fe1fa5fd6c859786465472ee10 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 20 Apr 2012 10:21:28 -0500 Subject: UserProfile model and fields shuffle Move this model into the devel/ application, and move the PGPKeyField which is used only by these models into the application as well. This involves updating some old migrations along the way to ensure we don't reference a field class that no longer exists. Signed-off-by: Dan McGee --- main/admin.py | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'main/admin.py') diff --git a/main/admin.py b/main/admin.py index 783d07e..741f666 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) -- cgit v1.2.3-24-g4f1b