summaryrefslogtreecommitdiff
path: root/ishtar_common/data_importer.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-03-06 17:02:09 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-03-06 17:02:09 +0100
commitfa105b35025742223d4238c8314287ad9e9f78a5 (patch)
treea23858d5894be17cb2d0caa08060c66e48994837 /ishtar_common/data_importer.py
parentda42af85b96513e69db706555fa6ac02b38bcaa7 (diff)
parent4c5e12584c253b3d84abcf946cb6ce1bae8fcbcb (diff)
downloadIshtar-fa105b35025742223d4238c8314287ad9e9f78a5.tar.bz2
Ishtar-fa105b35025742223d4238c8314287ad9e9f78a5.zip
Merge branch 'v0.9' into wheezy
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())