From 32fbe5ef5c8d0c86e15b7d5fe2881b032cc8af17 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 22 Sep 2016 12:08:12 +0200 Subject: Fancy display for authors --- ishtar_common/models.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'ishtar_common/models.py') diff --git a/ishtar_common/models.py b/ishtar_common/models.py index b0625e25c..932beaf98 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -2358,6 +2358,21 @@ class Person(Address, Merge, OwnPerms, ValueGetter): values.append(attached_to) return u" ".join(values) + def fancy_str(self): + values = [""] + values += [unicode(getattr(self, attr)) for attr in ('surname', 'name') + if getattr(self, attr)] + if not values and self.raw_name: + values += [self.raw_name] + values += [""] + + if self.attached_to: + attached_to = unicode(self.attached_to) + if values: + values.append(u'-') + values.append(attached_to) + return u" ".join(values) + def get_values(self, prefix=''): values = super(Person, self).get_values(prefix=prefix) if not self.attached_to: @@ -2547,6 +2562,10 @@ class Author(models.Model): return unicode(self.person) + settings.JOINT + \ unicode(self.author_type) + def fancy_str(self): + return self.person.fancy_str() + settings.JOINT + \ + unicode(self.author_type) + def related_sources(self): return list(self.treatmentsource_related.all()) + \ list(self.operationsource_related.all()) + \ -- cgit v1.2.3