X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=influences%2Fmodels.py;h=78daa15992304ee33882f4da9922ee38a930f3c7;hb=682f6cde0a7bb2c822eb9ef69583259454a0d97b;hp=fcd1f51aa86f9e835dd230ad95d01c6eb682e7e4;hpb=10c0b5f57ee0c82993c04714c93ccf556ea9079d;p=matthijs%2Fprojects%2Fxerxes.git diff --git a/influences/models.py b/influences/models.py index fcd1f51..78daa15 100644 --- a/influences/models.py +++ b/influences/models.py @@ -1,7 +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 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): @@ -18,6 +21,9 @@ class Character(models.Model): def __str__(self): return self.name + def get_absolute_url(self): + return reverse('influences_influence_detail', kwargs={'object_id' : self.pk}) + class Meta: verbose_name = _("Character") verbose_name_plural = _("Characters") @@ -44,6 +50,9 @@ class Influence(models.Model): def __str__(self): return self.summary + 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 @@ -53,7 +62,9 @@ class Influence(models.Model): If private is True, private comments are included in this list. """ def quote_reply(comment): - return "\n".join(["> " + l for l in comment.comment.split("\n")]) + 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 # models as well