Importers: fix importer matching with new importer model behavior

1 files changed, 4 insertions, 3 deletions

diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 979b29b33..6cf5bff7d 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -665,8 +665,9 @@ class GeneralType(Cached, models.Model):
     def get_keys(self):
         keys = [self.txt_idx]
         content_type = ContentType.objects.get_for_model(self.__class__)
-        for ik in ItemKey.objects.filter(content_type=content_type,
-                                         object_id=self.pk).all():
+        for ik in ItemKey.objects.filter(
+                content_type=content_type, object_id=self.pk).exclude(
+                key=self.txt_idx).all():
             keys.append(ik.key)
         return keys
 
@@ -2008,7 +2009,7 @@ class ImportTarget(models.Model):
     def associated_model(self):
         try:
             return get_associated_model(
-                self.column.importer_type.associated_models,
+                self.column.importer_type.associated_models.klass,
                 self.target.split('__'))
         except KeyError:
             return