Import: fix strtoboolean formater

2 files changed, 6 insertions, 5 deletions

diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py
index 62d0d184d..6239bf4c0 100644
--- a/ishtar_common/data_importer.py
+++ b/ishtar_common/data_importer.py
@@ -412,7 +412,7 @@ class StrChoiceFormater(Formater, ChoiceChecker):
         if not self.strict:
             value = slugify(value)
         if value in self.equiv_dict:
-            self.match_table[origin_value] = self.equiv_dict[value]
+            self.match_table[origin_value] = self.equiv_dict[value] or ''
             return self.equiv_dict[value]
 
 
@@ -578,7 +578,8 @@ class StrToBoolean(Formater, ChoiceChecker):
         origin_value = value
         value = self.prepare(value)
         if value in self.dct:
-            self.match_table[origin_value] = _(self.dct[value])
+            val = self.dct[value] and "True" or "False"
+            self.match_table[origin_value] = _(val)
             return self.dct[value]
 
 logger = logging.getLogger(__name__)
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 25da4b7d7..3b2fca3dd 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -1420,12 +1420,12 @@ class TargetKey(models.Model):
         if not self.is_set:
             return None
         if self.target.formater_type.formater_type == 'StrToBoolean':
-            if self.key in ('False', '0'):
+            if self.value in ('False', '0'):
                 return False
-            elif self.key:
+            elif self.value:
                 return True
             return
-        return self.key
+        return self.value
 
     def save(self, *args, **kwargs):
         obj = super(TargetKey, self).save(*args, **kwargs)