Let Influence list and annote its comments itself.

[matthijs/projects/xerxes.git] / influences / admin.py

diff --git a/influences/admin.py b/influences/admin.py
index f3e882801f67314c8420580179a4df52921337c4..3c380ec27f73822bfb749f8b6855e443065a5bd2 100644 (file)
--- 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,