# HG changeset patch # User Bryan O'Sullivan # Date 1238515463 25200 # Node ID c17f8bffc9e50022296d3ce507616dd743cf6371 # Parent 0e33dd5d8288897a186f57f8c832f58d153bfaea Account for new Django admin model. diff -r 0e33dd5d8288 -r c17f8bffc9e5 web/hgbook/admin.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/hgbook/admin.py Tue Mar 31 09:04:23 2009 -0700 @@ -0,0 +1,23 @@ +from django.contrib import admin +from hgbook.comments.models import Comment, Element + +class CommentAdmin(admin.ModelAdmin): + list_display = ['element', 'submitter_name', 'comment', 'reviewed', + 'hidden', 'date'] + search_fields = ['comment'] + date_hierarchy = 'date' + list_filter = ['date', 'submitter_name'] + search_fields = ['title', 'submitter_name', 'submitter_url'] + fields = ( + (None, {'fields': ('submitter_name', 'element', 'comment')}), + ('Review and presentation state', + {'fields': ('reviewed', 'hidden')}), + ('Other info', {'fields': ('date', 'submitter_url', 'ip')}), + ) + +class ElementAdmin(admin.ModelAdmin): + search_fields = ['id', 'chapter'] + list_filter = ['chapter', 'title'] + +admin.site.register(Comment, CommentAdmin) +admin.site.register(Element, ElementAdmin) diff -r 0e33dd5d8288 -r c17f8bffc9e5 web/hgbook/comments/models.py --- a/web/hgbook/comments/models.py Tue Mar 31 08:58:45 2009 -0700 +++ b/web/hgbook/comments/models.py Tue Mar 31 09:04:23 2009 -0700 @@ -4,10 +4,6 @@ mutable = True class Element(models.Model): - class Admin: - search_fields = ['id', 'chapter'] - list_filter = ['chapter', 'title'] - id = models.CharField('ID attribute', max_length=64, editable=False, primary_key=True) chapter = models.CharField('Chapter ID', max_length=64, editable=False, @@ -18,20 +14,6 @@ return self.id class Comment(models.Model): - class Admin: - list_display = ['element', 'submitter_name', 'comment', 'reviewed', - 'hidden', 'date'] - search_fields = ['comment'] - date_hierarchy = 'date' - list_filter = ['date', 'submitter_name'] - search_fields = ['title', 'submitter_name', 'submitter_url'] - fields = ( - (None, {'fields': ('submitter_name', 'element', 'comment')}), - ('Review and presentation state', - {'fields': ('reviewed', 'hidden')}), - ('Other info', {'fields': ('date', 'submitter_url', 'ip')}), - ) - element = models.ForeignKey(Element, help_text='ID of paragraph that was commented on') comment = models.TextField(editable=mutable,