summaryrefslogtreecommitdiff
path: root/ishtar_common/data_importer.py
diff options
context:
space:
mode:
Diffstat (limited to 'ishtar_common/data_importer.py')
-rw-r--r--ishtar_common/data_importer.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py
index 00aa34f4c..b88fbff2f 100644
--- a/ishtar_common/data_importer.py
+++ b/ishtar_common/data_importer.py
@@ -431,7 +431,7 @@ class StrChoiceFormater(Formater, ChoiceChecker):
if self.model and v:
v = self.model.objects.get(pk=v)
self.equiv_dict[value] = v
- self.add_key(v, value)
+ self.add_key(v, value, import_instance)
self.new_keys[value] = v
elif self.create and res == len(self.choices):
self.equiv_dict[value] = self.new(base_value)
@@ -479,7 +479,7 @@ class StrChoiceFormater(Formater, ChoiceChecker):
def new(self, value):
return
- def add_key(self, obj, value):
+ def add_key(self, obj, value, importer=None):
return
def format(self, value):
@@ -509,14 +509,14 @@ class TypeFormater(StrChoiceFormater):
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):
+ for key in item.get_keys(importer=import_instance):
self.equiv_dict[key] = item
def prepare(self, value):
return slugify(unicode(value).strip())
- def add_key(self, obj, value):
- obj.add_key(slugify(value), force=True)
+ def add_key(self, obj, value, importer=None):
+ obj.add_key(slugify(value), force=True, importer=importer)
def new(self, value):
values = copy.copy(self.defaults)