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

diff --git a/influences/models.py b/influences/models.py
index aefa83c..7ddd9d5 100644
--- a/influences/models.py
+++ b/influences/models.py
@@ -1,20 +1,23 @@
 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):
+    STATUS_CHOICES = (
+        ('N', _('New')),
+        ('A', _('Approved')),
+    )
     created     = models.DateField(auto_now_add=1, verbose_name = _("Creation time"))
     modified    = models.DateField(auto_now=1, verbose_name = _("Modification time"))
     name        = models.CharField(max_length=255, verbose_name = _("Name"))
+    status      = models.CharField(max_length=2, choices=STATUS_CHOICES, default='N', verbose_name = _("Status"))
     player      = models.ForeignKey(User, verbose_name = _("Player"))
 
     def __str__(self):
         return self.name
 
-    class Admin:
-        pass
-
     class Meta:
         verbose_name = _("Character")
         verbose_name_plural = _("Characters")
@@ -30,7 +33,7 @@ class Influence(models.Model):
     modified    = models.DateField(auto_now=1, verbose_name = _("Modification time"))
     
     character   = models.ForeignKey(Character, verbose_name = _("Character"))
-    contact     = models.CharField(max_length=255, verbose_name = _("Contact"))
+    contact     = models.CharField(max_length=255, verbose_name = _("Contact Name"))
     summary     = models.CharField(max_length=255, verbose_name = _("Summary"))
     description = models.TextField(verbose_name = _("Description"))
     status      = models.TextField(max_length=1, choices=STATUS_CHOICES, default='N', verbose_name = _("Status"))
@@ -41,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: