diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-10-09 19:46:51 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-10-24 12:06:09 +0200 |
| commit | afdb9a1209f374d399d5c52935e82baff81755d0 (patch) | |
| tree | f69a49c5a8136c141ed9275e4fb97e0ffbda835e /ishtar_common/management/commands | |
| parent | 66dbc83679641d1786c33088f1b90a9fa8cb94a6 (diff) | |
| download | Ishtar-afdb9a1209f374d399d5c52935e82baff81755d0.tar.bz2 Ishtar-afdb9a1209f374d399d5c52935e82baff81755d0.zip | |
Fix reassociate similar image command when reference is Null
Diffstat (limited to 'ishtar_common/management/commands')
| -rw-r--r-- | ishtar_common/management/commands/reassociate_similar_images.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/ishtar_common/management/commands/reassociate_similar_images.py b/ishtar_common/management/commands/reassociate_similar_images.py index e76f4e725..a3acfea16 100644 --- a/ishtar_common/management/commands/reassociate_similar_images.py +++ b/ishtar_common/management/commands/reassociate_similar_images.py @@ -129,11 +129,17 @@ class Command(BaseCommand): nb_conflicted_items += 1 for attr, ref_value, other_value in conflicted_values: conflicts.append([ - ref_item.pk, ref_item.reference.encode('utf-8'), - ref_item.cache_related_label.encode('utf-8'), + 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'), - item.cache_related_label.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'), attr, unicode(ref_value).encode('utf-8'), unicode(other_value).encode('utf-8') |