Person: add salutation field (refs #3188)

1 files changed, 10 insertions, 1 deletions

diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index eda26cd97..6150ab0aa 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -2303,6 +2303,8 @@ class Person(Address, Merge, OwnPerms, ValueGetter):
                                  blank=True, null=True)
     title = models.ForeignKey(TitleType, verbose_name=_(u"Title"),
                               blank=True, null=True)
+    salutation = models.CharField(_(u"Salutation"), max_length=200,
+                                  blank=True, null=True)
     surname = models.CharField(_(u"Surname"), max_length=50, blank=True,
                                null=True)
     name = models.CharField(_(u"Name"), max_length=200, blank=True,
@@ -2329,6 +2331,12 @@ class Person(Address, Merge, OwnPerms, ValueGetter):
             ("delete_own_person", ugettext(u"Can delete own Person")),
         )
 
+    @property
+    def full_title(self):
+        return u" ".join(
+            [unicode(getattr(self, attr))
+             for attr in ['title', 'salutation'] if getattr(self, attr)])
+
     def simple_lbl(self):
         values = [unicode(getattr(self, attr)) for attr in ('surname', 'name')
                   if getattr(self, attr)]
@@ -2418,7 +2426,8 @@ class Person(Address, Merge, OwnPerms, ValueGetter):
         if self.title:
             values = [self.title.label]
         values += [unicode(getattr(self, attr))
-                   for attr in ('surname', 'name') if getattr(self, attr)]
+                   for attr in ('salutation', 'surname', 'name')
+                   if getattr(self, attr)]
         if not values and self.raw_name:
             values = [self.raw_name]
         if self.attached_to: