1 files changed, 9 insertions, 4 deletions
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index 5775eada8..dbce4670f 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -2539,11 +2539,16 @@ class JsonContentTypeFormMixin(object):
         exclude = []
 
     def __init__(self, *args, **kwargs):
-        super(JsonContentTypeFormMixin, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         choices = []
-        for pk, label in self.fields["content_type"].choices:
-            if not pk:
-                choices.append((pk, label))
+        for choice, label in self.fields["content_type"].choices:
+            if not choice:
+                choices.append(('', label))
+                continue
+            try:
+                pk = int(choice.value)
+            except ValueError:
+                choices.append(('', label))
                 continue
             ct = ContentType.objects.get(pk=pk)
             model_class = ct.model_class()