Merge branch 'master' of /srv/git/projects/parabolaweb

1 files changed, 12 insertions, 4 deletions

diff --git a/main/admin.py b/main/admin.py
index 51859ad3..e86e5cab 100644
--- a/main/admin.py
+++ b/main/admin.py
@@ -1,7 +1,7 @@
 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, Todolist, UserProfile
 
 class DonorAdmin(admin.ModelAdmin):
     list_display = ('name', 'visible')
@@ -14,15 +14,21 @@ class ArchAdmin(admin.ModelAdmin):
     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',)
 
+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
@@ -40,4 +46,6 @@ admin.site.register(Package, PackageAdmin)
 admin.site.register(Arch, ArchAdmin)
 admin.site.register(Repo, RepoAdmin)
 
+admin.site.register(Todolist, TodolistAdmin)
+
 # vim: set ts=4 sw=4 et: