X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=influences%2Fmodels.py;h=198b0318aa77e63f614618bc50025bad94d46156;hb=ffe8bfb47649a438d1485179e68abfb5e0e17a48;hp=7ddd9d53e44300ef16d8dc054fa6626e9086f075;hpb=06863704f30a2025ee82fd89a41716f5ab2cce87;p=matthijs%2Fprojects%2Fxerxes.git diff --git a/influences/models.py b/influences/models.py index 7ddd9d5..198b031 100644 --- a/influences/models.py +++ b/influences/models.py @@ -1,4 +1,5 @@ from django.db import models +from django.core.urlresolvers import reverse from django.contrib.auth.models import User from django.utils.translation import ugettext_lazy as _ from threadedcomments.models import ThreadedComment @@ -18,6 +19,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,7 +48,17 @@ 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 + 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): return "\n".join(["> " + l for l in comment.comment.split("\n")]) @@ -60,8 +74,10 @@ class Influence(models.Model): # 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) - + 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: