diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-05-12 15:52:08 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-05-12 15:52:08 -0300 |
commit | 57804e82978727001fc62e5b1106d69531a9cd97 (patch) | |
tree | 770756414046565af864487a0020f2ef7be8df0a /main/admin.py | |
parent | 37075e5f3423a69fec03faf31ce2133c55374dfc (diff) | |
parent | f6464da0e14047e9db803f4b40c18ba644e75f24 (diff) |
Merge branch 'master' of git://projects.archlinux.org/archweb
Conflicts:
templates/packages/packages_list.html
templates/public/index.html
Diffstat (limited to 'main/admin.py')
-rw-r--r-- | main/admin.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/main/admin.py b/main/admin.py index 51859ad3..45bc5ab2 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,8 +14,8 @@ 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', 'svn_root') + list_filter = ('testing', 'staging') search_fields = ('name',) class PackageAdmin(admin.ModelAdmin): @@ -23,6 +23,10 @@ class PackageAdmin(admin.ModelAdmin): 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 +44,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: |