projects
/
matthijs
/
projects
/
xerxes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add list_or_value template filter.
[matthijs/projects/xerxes.git]
/
influences
/
models.py
diff --git
a/influences/models.py
b/influences/models.py
index 9ba3f3cd4689eaf8e7e633e3a0337bc875f26780..c513c1a5c307e3f29b9365c12252fac42e8acc78 100644
(file)
--- a/
influences/models.py
+++ b/
influences/models.py
@@
-5,6
+5,7
@@
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
from django.utils.translation import ugettext_lazy as _
from threadedcomments.models import ThreadedComment
from xerxes.tools.text import rewrap
+from string import strip
# Create your models here.
class Character(models.Model):
# Create your models here.
class Character(models.Model):
@@
-46,7
+47,8
@@
class Influence(models.Model):
modified = models.DateField(auto_now=1, verbose_name = _("Modification time"))
initiator = models.ForeignKey(Character, verbose_name = _("Initiator"), related_name='initiated_influences')
modified = models.DateField(auto_now=1, verbose_name = _("Modification time"))
initiator = models.ForeignKey(Character, verbose_name = _("Initiator"), related_name='initiated_influences')
- contact = models.CharField(max_length=255, verbose_name = _("Contact Name"))
+ other_contacts = models.CharField(max_length=255, blank = True, verbose_name = _("Other Contacts"))
+ other_characters = models.ManyToManyField(Character, blank = True, verbose_name = _("Involved characters"), related_name='influences_involved_in')
summary = models.CharField(max_length=255, verbose_name = _("Summary"))
description = models.TextField(verbose_name = _("Description"))
todo = models.TextField(verbose_name = _("Todo"))
summary = models.CharField(max_length=255, verbose_name = _("Summary"))
description = models.TextField(verbose_name = _("Description"))
todo = models.TextField(verbose_name = _("Todo"))
@@
-92,6
+94,14
@@
class Influence(models.Model):
prefix=prefix)
return comments
prefix=prefix)
return comments
+ @property
+ def involved(self):
+ """ Returns the Characters and contacts (strings) involved """
+ chars = list(self.other_characters.all())
+ if (self.other_contacts):
+ chars.extend(map(strip,self.other_contacts.split(',')))
+ return chars
+
class Meta:
verbose_name = _("Influence")
verbose_name_plural = _("Influences")
class Meta:
verbose_name = _("Influence")
verbose_name_plural = _("Influences")