Let Influence list and annote its comments itself.

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

diff --git a/influences/models.py b/influences/models.py
index 8124b8550246518ae0c92638a0da40b7d8b3b787..7ddd9d53e44300ef16d8dc054fa6626e9086f075 100644 (file)
--- a/influences/models.py
+++ b/influences/models.py
@@ -1,6 +1,7 @@
 from django.db import models
 from django.contrib.auth.models import User
 from django.utils.translation import ugettext_lazy as _
+from threadedcomments.models import ThreadedComment
 
 # Create your models here.
 class Character(models.Model):
@@ -17,11 +18,6 @@ class Character(models.Model):
     def __str__(self):
         return self.name
 
-    class Admin:
-        list_filter=('status', 'player')
-        search_fields=('name')
-        list_display=('player', 'name', 'status') 
-
     class Meta:
         verbose_name = _("Character")
         verbose_name_plural = _("Characters")
@@ -48,10 +44,25 @@ class Influence(models.Model):
     def __str__(self):
         return self.summary
 
-    class Admin:
-        list_filter=('character', 'status', 'longterm')
-        search_fields=('character', 'summary', 'description', 'contact')
-        list_display=('character', 'contact', 'summary', 'longterm', 'status') 
+    def get_comments(self, private):
+        def quote_reply(comment):
+            return "\n".join(["> " + l for l in comment.comment.split("\n")])
+
+        # Import here to prevent dependency loop, since forms depends on
+        # models as well
+        from forms import get_influence_comment_form
+
+        if private:
+            comments = ThreadedComment.objects.get_tree(self)
+        else:
+            comments = ThreadedComment.public.get_tree(self)
+
+        # Annotate each comment with a proper reply form
+        for comment in comments:
+            initial = { 'comment' : quote_reply(comment) }
+            comment.reply_form = get_influence_comment_form(private, comment)(initial=initial)
+
+        return comments
 
     class Meta:
         verbose_name = _("Influence")