X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=influences%2Fmodels.py;h=7ddd9d53e44300ef16d8dc054fa6626e9086f075;hb=06863704f30a2025ee82fd89a41716f5ab2cce87;hp=6094181ae66ccd332ad971ad30b07a0838baa3d8;hpb=1e49a91ca729ea0596d07f47b917149c230e9614;p=matthijs%2Fprojects%2Fxerxes.git

diff --git a/influences/models.py b/influences/models.py
index 6094181..7ddd9d5 100644
--- 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,9 +18,6 @@ class Character(models.Model):
     def __str__(self):
         return self.name
 
-    class Admin:
-        pass
-
     class Meta:
         verbose_name = _("Character")
         verbose_name_plural = _("Characters")
@@ -46,12 +44,28 @@ class Influence(models.Model):
     def __str__(self):
         return self.summary
 
-    class Admin:
-        list_filter=('character', 'status', 'longterm')
-        search_fields=('character', '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")
         verbose_name_plural = _("Influences")
 
+# vim: set sts=4 sw=4 expandtab: