X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=influences%2Fadmin.py;h=487b237344c0c3c09a0c59936c64df73ea4e27fe;hb=d55284fdb62ff1b4d8dec653bf13cf44b4b01022;hp=126cd5cea9ddd20232a6a5a9d6050b172e310eb7;hpb=bf745388baa1473feae115368179cf54bd910087;p=matthijs%2Fprojects%2Fxerxes.git diff --git a/influences/admin.py b/influences/admin.py index 126cd5c..487b237 100644 --- a/influences/admin.py +++ b/influences/admin.py @@ -8,6 +8,7 @@ from threadedcomments.models import ThreadedComment from django.utils.safestring import mark_safe from django.utils.translation import ugettext as _ from django.utils.encoding import force_unicode +from forms import get_influence_comment_form class CharacterAdmin(admin.ModelAdmin): list_filter=('status', 'player') @@ -17,9 +18,9 @@ class CharacterAdmin(admin.ModelAdmin): admin.site.register(Character, CharacterAdmin) class InfluenceAdmin(admin.ModelAdmin): - list_filter=('character', 'status', 'longterm') - search_fields=('character', 'summary', 'description', 'contact') - list_display=('character', 'contact', 'summary', 'longterm', 'status') + list_filter=('initiator', 'status', 'longterm', 'todo') + search_fields=('initiator', 'summary', 'description', 'contact') + list_display=('initiator', 'summary', 'longterm', 'status') class Media: js = ('base/js/yahoo-dom-event.js', 'base/js/logger-debug.js') @@ -45,6 +46,7 @@ class InfluenceAdmin(admin.ModelAdmin): 'object' : obj, 'opts' : opts, 'comments' : comments, + 'comment_form' : get_influence_comment_form(request.user.is_staff, None)(), 'media' : mark_safe(self.media), } return render_to_response('admin/influences/influence/comments.html', context, RequestContext(request))