Allow Influence.todo to be blank.

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

diff --git a/influences/models.py b/influences/models.py
index 049cbeba4f4a7d5f6d82aba0c15439016685c014..6464e683deb20a1277c4cdf2537a4be5661640b8 100644 (file)
--- a/influences/models.py
+++ b/influences/models.py
@@ -1,9 +1,10 @@
 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.text import normalize_newlines
 from django.utils.translation import ugettext_lazy as _
 from threadedcomments.models import ThreadedComment
+from xerxes.tools.text import rewrap
 
 # Create your models here.
 class Character(models.Model):
@@ -17,7 +18,7 @@ class Character(models.Model):
     status      = models.CharField(max_length=2, choices=STATUS_CHOICES, default='N', verbose_name = _("Status"))
     player      = models.ForeignKey(User, verbose_name = _("Player"))
 
-    def __str__(self):
+    def __unicode__(self):
         return self.name
 
     def get_absolute_url(self):
@@ -41,12 +42,13 @@ class Influence(models.Model):
     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"))
+    todo        = models.TextField(blank=True, verbose_name = _("Todo"))
+    status      = models.CharField(max_length=1, choices=STATUS_CHOICES, default='N', verbose_name = _("Status"))
     longterm    = models.BooleanField(default=False, verbose_name = _("Long term"))
 
     result      = models.TextField(blank=True,verbose_name = _("Result"))
 
-    def __str__(self):
+    def __unicode__(self):
         return self.summary
 
     def get_absolute_url(self):
@@ -61,7 +63,8 @@ class Influence(models.Model):
         If private is True, private comments are included in this list.
         """
         def quote_reply(comment):
-            text = wrap(normalize_newlines(comment.comment), 72)
+            regex = "^([ >]*)(.*)$"
+            text = rewrap(normalize_newlines(comment.comment), 72, regex)
             return "\n".join(["> " + l for l in text.split("\n")])
 
         # Import here to prevent dependency loop, since forms depends on