X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fprojects%2Fxerxes.git;a=blobdiff_plain;f=influences%2Fmodels.py;h=c513c1a5c307e3f29b9365c12252fac42e8acc78;hp=aa64f269fbca96db6bf6d5479775fed9d0465a11;hb=fe2d9095c7819fbe98ae1448a8aba1094090cdd8;hpb=8c2990da8abdf2019efbbed2b6ffa88806e8a535

diff --git a/influences/models.py b/influences/models.py
index aa64f26..c513c1a 100644
--- 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 string import strip
 
 # Create your models here.
 class Character(models.Model):
@@ -93,6 +94,14 @@ class Influence(models.Model):
                                            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")