X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;ds=sidebyside;f=apps%2Fpatchwork%2Fadmin.py;h=529790329ff0504a749892b61a7f84f79fc3a373;hb=f79c54871da0c36daaa559ec4a86f3e926bbe9ff;hp=264d8650f69902f390b91989ec23c6c4b981f186;hpb=b709047f21884e22fddd3256e4cd83139de5ed1b;p=patchwork

diff --git a/apps/patchwork/admin.py b/apps/patchwork/admin.py
index 264d865..5297903 100644
--- a/apps/patchwork/admin.py
+++ b/apps/patchwork/admin.py
@@ -1,44 +1,50 @@
 from django.contrib import admin
-from django.contrib.sites.models import Site
-from django.contrib.auth.models import User
 from patchwork.models import Project, Person, UserProfile, State, Patch, \
-	     Comment, Bundle
-
-admin_site = admin.AdminSite()
+         Comment, Bundle
 
 class ProjectAdmin(admin.ModelAdmin):
-    pass
-admin_site.register(Project, ProjectAdmin)
+    list_display = ('name', 'linkname','listid', 'listemail')
+admin.site.register(Project, ProjectAdmin)
 
 class PersonAdmin(admin.ModelAdmin):
-    pass
-admin_site.register(Person, PersonAdmin)
+    list_display = ('__unicode__', 'has_account')
+    search_fields = ('name', 'email')
+    def has_account(self, person):
+        return bool(person.user)
+    has_account.boolean = True
+    has_account.admin_order_field = 'user'
+    has_account.short_description = 'Account'
+admin.site.register(Person, PersonAdmin)
 
 class UserProfileAdmin(admin.ModelAdmin):
-    pass
-admin_site.register(UserProfile, UserProfileAdmin)
+    search_fields = ('user__username', 'user__first_name', 'user__last_name')
+admin.site.register(UserProfile, UserProfileAdmin)
 
 class StateAdmin(admin.ModelAdmin):
-    pass
-admin_site.register(State, StateAdmin)
+    list_display = ('name', 'action_required')
+admin.site.register(State, StateAdmin)
 
 class PatchAdmin(admin.ModelAdmin):
-    pass
-admin_site.register(Patch, PatchAdmin)
+    list_display = ('name', 'submitter', 'project', 'state', 'date',
+            'archived', 'is_pull_request')
+    list_filter = ('project', 'state', 'archived')
+    search_fields = ('name', 'submitter__name', 'submitter__email')
+    date_hierarchy = 'date'
+    def is_pull_request(self, patch):
+        return bool(patch.pull_url)
+    is_pull_request.boolean = True
+    is_pull_request.admin_order_field = 'pull_url'
+    is_pull_request.short_description = 'Pull'
+admin.site.register(Patch, PatchAdmin)
 
 class CommentAdmin(admin.ModelAdmin):
-    pass
-admin_site.register(Comment, CommentAdmin)
+    list_display = ('patch', 'submitter', 'date')
+    search_fields = ('patch__name', 'submitter__name', 'submitter__email')
+    date_hierarchy = 'date'
+admin.site.register(Comment, CommentAdmin)
 
 class BundleAdmin(admin.ModelAdmin):
-    pass
-admin_site.register(Bundle, BundleAdmin)
-
-class UserAdmin(admin.ModelAdmin):
-    pass
-admin_site.register(User, UserAdmin)
-
-class SiteAdmin(admin.ModelAdmin):
-    pass
-admin_site.register(Site, SiteAdmin)
-
+    list_display = ('name', 'owner', 'project', 'public')
+    list_filter = ('public', 'project')
+    search_fields = ('name', 'owner')
+admin.site.register(Bundle, BundleAdmin)