From 34ebc0b6a3b9273a65aa3f9d206872ca41a2fe96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Fri, 15 Nov 2013 16:54:02 +0100 Subject: [PATCH] fix speakers/reporters to be RelationValues --- themis/importexport/sync.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/themis/importexport/sync.py b/themis/importexport/sync.py index fadc7d7..e59c4a8 100644 --- a/themis/importexport/sync.py +++ b/themis/importexport/sync.py @@ -242,17 +242,20 @@ class SyncFromThemis(UtilityView): data.get(attr), '%Y-%m-%d').toordinal()) # initializing speakers list - if not object.speakers: - object.speakers = [] + speakers = [] for attr in ('orateurs_seance', 'orateurs', 'orateurs_en_commission', 'orateurs_en_seanceprop', 'orateurs_rapportcom', 'orateurs_seance_reponse_orale'): - if data.get(attr): - object.speakers = list(set(object.speakers + data.get(attr))) + speakers = list(set(speakers + (data.get(attr) or []))) + + object.speakers = [self.get_author_intid(x) for x in speakers] + object.speakers = [RelationValue(x) for x in object.speakers if x] + + reporters = [] + object.reporters = [self.get_author_intid(x) for x in data.get('rapporteurs') or []] + object.reporters = [RelationValue(x) for x in object.reporters if x] - if data.get('rapporteurs'): - object.reporters = data.get(attr) if data.get('date_sanction_promulgation'): object.sanction_date = datetime.date.fromordinal(