1 files changed, 16 insertions, 18 deletions
diff --git a/main/admin.py b/main/admin.py
index 5dffb431..ec2b5bc8 100644
--- a/main/admin.py
+++ b/main/admin.py
@@ -1,37 +1,35 @@
 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, UserProfile
+from main.models import Arch, Donor, Package, Repo
+
 
 class DonorAdmin(admin.ModelAdmin):
+    list_display = ('name', 'visible', 'created')
+    list_filter = ('visible', 'created')
     search_fields = ('name',)
+    exclude = ('created',)
+
 
 class ArchAdmin(admin.ModelAdmin):
-    list_display = ('name', 'agnostic')
+    list_display = ('name', 'agnostic', 'required_signoffs')
     list_filter = ('agnostic',)
     search_fields = ('name',)
 
+
 class RepoAdmin(admin.ModelAdmin):
-    list_display = ('name', 'testing', 'bugs_project', 'svn_root')
-    list_filter = ('testing',)
+    list_display = ('name', 'testing', 'staging', 'bugs_project',
+            'bugs_category', 'svn_root')
+    list_filter = ('testing', 'staging')
     search_fields = ('name',)
 
+
 class PackageAdmin(admin.ModelAdmin):
-    list_display = ('pkgname', 'repo', 'arch', 'last_update')
+    list_display = ('pkgname', 'full_version', 'repo', 'arch', 'packager',
+            'last_update', 'build_date')
     list_filter = ('repo', 'arch')
-    search_fields = ('pkgname',)
-
-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')
+    search_fields = ('pkgname', 'pkgbase', 'pkgdesc')
+    date_hierarchy = 'build_date'
 
 
-admin.site.register(User, UserProfileAdmin)
 admin.site.register(Donor, DonorAdmin)
 
 admin.site.register(Package, PackageAdmin)