Archaeological files: fix default labels

1 files changed, 7 insertions, 1 deletions

diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 3e0d061e4..a22a9307f 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -718,7 +718,9 @@ class GeneralType(Cached, models.Model):
         item = cls.get_cache(slug)
         if item:
             return item
-        item, created = cls.objects.get_or_create(
+        if isinstance(slug, list):
+            slug = slug[0]
+        item, __ = cls.objects.get_or_create(
             txt_idx=slug, defaults={'label': label})
         return item
 
@@ -1040,6 +1042,10 @@ class GeneralType(Cached, models.Model):
 
     def save(self, *args, **kwargs):
         if not self.id and not self.label:
+            txt_idx = self.txt_idx
+            if isinstance(txt_idx, list):
+                txt_idx = txt_idx[0]
+                self.txt_idx = txt_idx
             self.label = " ".join(" ".join(self.txt_idx.split('-'))
                                   .split('_')).title()
         if not self.txt_idx: