From 46c96e1772486c6c98e7a371c862208230baa437 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 9 Oct 2018 19:50:49 +0200 Subject: Fix reassociate similar image command when reference is Null - 2 --- .../commands/reassociate_similar_images.py | 37 ++++++++++------------ 1 file changed, 16 insertions(+), 21 deletions(-) (limited to 'ishtar_common/management') diff --git a/ishtar_common/management/commands/reassociate_similar_images.py b/ishtar_common/management/commands/reassociate_similar_images.py index a3acfea16..992e7f5ea 100644 --- a/ishtar_common/management/commands/reassociate_similar_images.py +++ b/ishtar_common/management/commands/reassociate_similar_images.py @@ -125,35 +125,30 @@ class Command(BaseCommand): continue setattr(ref_item, attr, other_value) + base_csv = [ + ref_item.pk, + ref_item.reference.encode('utf-8') if + ref_item.reference else "", + ref_item.cache_related_label.encode('utf-8') if + ref_item.cache_related_label else "", + ref_item.image.name.encode('utf-8'), + item.pk, + item.reference.encode('utf-8') if + item.reference else "", + item.cache_related_label.encode('utf-8') if + item.cache_related_label else "", + item.image.name.encode('utf-8'), + ] if conflicted_values: nb_conflicted_items += 1 for attr, ref_value, other_value in conflicted_values: - conflicts.append([ - ref_item.pk, - ref_item.reference.encode('utf-8') if - ref_item.reference else "", - ref_item.cache_related_label.encode('utf-8') if - ref_item.cache_related_label else "", - ref_item.image.name.encode('utf-8'), - item.pk, - item.reference.encode('utf-8') if - item.reference else "", - item.cache_related_label.encode('utf-8') if - item.cache_related_label else "", - item.image.name.encode('utf-8'), + conflicts.append(base_csv + [ attr, unicode(ref_value).encode('utf-8'), unicode(other_value).encode('utf-8') ]) continue - merged.append([ - ref_item.pk, ref_item.reference.encode('utf-8'), - ref_item.cache_related_label.encode('utf-8'), - ref_item.image.name.encode('utf-8'), - item.pk, item.reference.encode('utf-8'), - item.cache_related_label.encode('utf-8'), - item.image.name.encode('utf-8'), - ]) + merged.append(base_csv) for m2m in m2ms: for m2 in getattr(item, m2m).all(): -- cgit v1.2.3