X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=influences%2Fmodels.py;h=049cbeba4f4a7d5f6d82aba0c15439016685c014;hb=e0314624fa1da2a58161cb43359f72f255aa9b26;hp=8124b8550246518ae0c92638a0da40b7d8b3b787;hpb=687734094499d8c8cb11d726ddc838d64abede42;p=matthijs%2Fprojects%2Fxerxes.git

diff --git a/influences/models.py b/influences/models.py
index 8124b85..049cbeb 100644
--- a/influences/models.py
+++ b/influences/models.py
@@ -1,6 +1,9 @@
 from django.db import models
+from django.core.urlresolvers import reverse
 from django.contrib.auth.models import User
+from django.utils.text import normalize_newlines, wrap
 from django.utils.translation import ugettext_lazy as _
+from threadedcomments.models import ThreadedComment
 
 # Create your models here.
 class Character(models.Model):
@@ -17,10 +20,8 @@ class Character(models.Model):
     def __str__(self):
         return self.name
 
-    class Admin:
-        list_filter=('status', 'player')
-        search_fields=('name')
-        list_display=('player', 'name', 'status') 
+    def get_absolute_url(self):
+        return reverse('influences_influence_detail', kwargs={'object_id' : self.pk})
 
     class Meta:
         verbose_name = _("Character")
@@ -48,10 +49,38 @@ 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_absolute_url(self):
+        return reverse('influences_influence_detail', kwargs={'object_id' : self.pk})
+
+    def get_comments(self, private):
+        """
+        Gets the comments that have been made on this Influence. Each
+        comment gets its reply_form attribute set to a Form appropriate
+        for replying to the comment.
+        
+        If private is True, private comments are included in this list.
+        """
+        def quote_reply(comment):
+            text = wrap(normalize_newlines(comment.comment), 72)
+            return "\n".join(["> " + l for l in text.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) }
+            prefix = "reply-to-%s" % (comment.pk)
+            FormClass = get_influence_comment_form(private, comment)
+            comment.reply_form = FormClass(initial=initial,
+                                           prefix=prefix)
+        return comments
 
     class Meta:
         verbose_name = _("Influence")