summaryrefslogtreecommitdiff
path: root/ishtar_common/data_importer.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-03-06 16:53:10 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-03-06 16:53:10 +0100
commit67208dbd830ce4eb75d77f59d1ffd31c63b19d80 (patch)
treecff73359a85d362bd3b24f853fb6d461a583b91b /ishtar_common/data_importer.py
parent161d29195cb9719b9c6ae4903c2c526f797bdf5f (diff)
parentad5d9f7c0d5b0ca5a0ba76e279fc5d6e2683216a (diff)
downloadIshtar-67208dbd830ce4eb75d77f59d1ffd31c63b19d80.tar.bz2
Ishtar-67208dbd830ce4eb75d77f59d1ffd31c63b19d80.zip
Merge branch 'master' into v0.9
Diffstat (limited to 'ishtar_common/data_importer.py')
-rw-r--r--ishtar_common/data_importer.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py
index 426d32a7a..34394341c 100644
--- a/ishtar_common/data_importer.py
+++ b/ishtar_common/data_importer.py
@@ -450,10 +450,11 @@ class TypeFormater(StrChoiceFormater):
self.match_table = {}
self.new_keys = {}
self.import_instance = import_instance
- for item in model.objects.all():
- self.choices.append((item.pk, unicode(item)))
- for key in item.get_keys(importer_id=import_instance.pk):
- self.equiv_dict[key] = item
+ if self.import_instance:
+ for item in model.objects.all():
+ self.choices.append((item.pk, unicode(item)))
+ for key in item.get_keys(importer_id=import_instance.pk):
+ self.equiv_dict[key] = item
def prepare(self, value):
return slugify(unicode(value).strip())