X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;ds=sidebyside;f=influences%2Fadmin.py;h=3c380ec27f73822bfb749f8b6855e443065a5bd2;hb=06863704f30a2025ee82fd89a41716f5ab2cce87;hp=f3e882801f67314c8420580179a4df52921337c4;hpb=0cc5c005cc3e24e3859fe00edfa01f560025a7ee;p=matthijs%2Fprojects%2Fxerxes.git diff --git a/influences/admin.py b/influences/admin.py index f3e8828..3c380ec 100644 --- a/influences/admin.py +++ b/influences/admin.py @@ -7,8 +7,6 @@ from django.contrib.contenttypes import generic from threadedcomments.models import ThreadedComment from django.utils.safestring import mark_safe -from views import get_influence_comment_form, quote_reply - class CharacterAdmin(admin.ModelAdmin): list_filter=('status', 'player') search_fields=('name',) @@ -35,11 +33,7 @@ class InfluenceAdmin(admin.ModelAdmin): opts = model._meta obj = get_object_or_404(model, pk=object_id) - comments = ThreadedComment.objects.get_tree(obj) - # Annotate each comment with a proper reply form - for comment in comments: - initial = { 'comment' : quote_reply(comment) } - comment.reply_form = get_influence_comment_form(request.user.is_staff, comment)(initial=initial) + comments = obj.get_comments(private=True) context = { 'root_path' : self.admin_site.root_path,