hgbook

changeset 608:c17f8bffc9e5

Account for new Django admin model.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue Mar 31 09:04:23 2009 -0700 (2009-03-31)
parents 0e33dd5d8288
children c44d5854620b c82ff69f0935
files web/hgbook/admin.py web/hgbook/comments/models.py
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/web/hgbook/admin.py	Tue Mar 31 09:04:23 2009 -0700
     1.3 @@ -0,0 +1,23 @@
     1.4 +from django.contrib import admin
     1.5 +from hgbook.comments.models import Comment, Element
     1.6 +
     1.7 +class CommentAdmin(admin.ModelAdmin):
     1.8 +    list_display = ['element', 'submitter_name', 'comment', 'reviewed',
     1.9 +                    'hidden', 'date']
    1.10 +    search_fields = ['comment']
    1.11 +    date_hierarchy = 'date'
    1.12 +    list_filter = ['date', 'submitter_name']
    1.13 +    search_fields = ['title', 'submitter_name', 'submitter_url']
    1.14 +    fields = (
    1.15 +        (None, {'fields': ('submitter_name', 'element', 'comment')}),
    1.16 +        ('Review and presentation state',
    1.17 +         {'fields': ('reviewed', 'hidden')}),
    1.18 +        ('Other info', {'fields': ('date', 'submitter_url', 'ip')}),
    1.19 +        )
    1.20 +
    1.21 +class ElementAdmin(admin.ModelAdmin):
    1.22 +    search_fields = ['id', 'chapter']
    1.23 +    list_filter = ['chapter', 'title']
    1.24 +
    1.25 +admin.site.register(Comment, CommentAdmin)
    1.26 +admin.site.register(Element, ElementAdmin)
     2.1 --- a/web/hgbook/comments/models.py	Tue Mar 31 08:58:45 2009 -0700
     2.2 +++ b/web/hgbook/comments/models.py	Tue Mar 31 09:04:23 2009 -0700
     2.3 @@ -4,10 +4,6 @@
     2.4  mutable = True
     2.5  
     2.6  class Element(models.Model):
     2.7 -    class Admin:
     2.8 -        search_fields = ['id', 'chapter']
     2.9 -        list_filter = ['chapter', 'title']
    2.10 -
    2.11      id = models.CharField('ID attribute', max_length=64, editable=False,
    2.12                            primary_key=True)
    2.13      chapter = models.CharField('Chapter ID', max_length=64, editable=False,
    2.14 @@ -18,20 +14,6 @@
    2.15          return self.id
    2.16      
    2.17  class Comment(models.Model):
    2.18 -    class Admin:
    2.19 -        list_display = ['element', 'submitter_name', 'comment', 'reviewed',
    2.20 -                        'hidden', 'date']
    2.21 -        search_fields = ['comment']
    2.22 -        date_hierarchy = 'date'
    2.23 -        list_filter = ['date', 'submitter_name']
    2.24 -        search_fields = ['title', 'submitter_name', 'submitter_url']
    2.25 -        fields = (
    2.26 -            (None, {'fields': ('submitter_name', 'element', 'comment')}),
    2.27 -            ('Review and presentation state',
    2.28 -             {'fields': ('reviewed', 'hidden')}),
    2.29 -            ('Other info', {'fields': ('date', 'submitter_url', 'ip')}),
    2.30 -            )
    2.31 -            
    2.32      element = models.ForeignKey(Element,
    2.33          help_text='ID of paragraph that was commented on')
    2.34      comment = models.TextField(editable=mutable,