From 999eefae2632bb01a968d088ccd6406f7b0bc896 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 29 Jan 2015 00:08:22 +0100 Subject: Fix display of operations - fix bibracte import of operations --- ishtar_common/data_importer.py | 3 +-- ishtar_common/models.py | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'ishtar_common') diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py index cde464e04..c2924a541 100644 --- a/ishtar_common/data_importer.py +++ b/ishtar_common/data_importer.py @@ -673,8 +673,7 @@ class Importer(object): values = [v] many_values = getattr(func, 'many_split', None) if many_values: - values = re.compile(func.many_split).split(values) - + values = re.split(func.many_split, values[0]) formated_values = [] for idx, v in enumerate(values): value = None diff --git a/ishtar_common/models.py b/ishtar_common/models.py index ab558ce75..af43f28e9 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -1132,6 +1132,8 @@ class Person(Address, Merge, OwnPerms, ValueGetter) : 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] if self.attached_to: values.append(u"- " + unicode(self.attached_to)) return u" ".join(values) -- cgit v1.2.3