diff options
author | Étienne Loks <etienne.loks@proxience.com> | 2015-01-29 00:08:22 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@proxience.com> | 2015-01-29 00:08:22 +0100 |
commit | baf7f6d5da382877425a526e3a2044e9bf5fad56 (patch) | |
tree | aab855539a05f8b9c3dec8df43a7bd01b1adbed4 /ishtar_common | |
parent | 9859c31976a88c63baf36a66839d13eb3fdd3b88 (diff) | |
download | Ishtar-baf7f6d5da382877425a526e3a2044e9bf5fad56.tar.bz2 Ishtar-baf7f6d5da382877425a526e3a2044e9bf5fad56.zip |
Fix display of operations - fix bibracte import of operations
Diffstat (limited to 'ishtar_common')
-rw-r--r-- | ishtar_common/data_importer.py | 3 | ||||
-rw-r--r-- | ishtar_common/models.py | 2 |
2 files changed, 3 insertions, 2 deletions
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) |