JSON types: multi valued choices

1 files changed, 13 insertions, 3 deletions

diff --git a/ishtar_common/models_common.py b/ishtar_common/models_common.py
index e67b78d67..b1c291bee 100644
--- a/ishtar_common/models_common.py
+++ b/ishtar_common/models_common.py
@@ -1077,12 +1077,22 @@ class JsonData(models.Model, CachedGen):
         q = cls.objects.filter(data__has_key=key[len("data__") :]).values_list(
             "data", flat=True
         )
+        multi = False
         for value in q.all():
             for k in splitted_key:
                 value = value[k]
-            choices.add(value)
-        choices = [("", "")] + [(v, v) for v in sorted(list(choices))]
-        cache.set(cache_key, choices, settings.CACHE_SMALLTIMEOUT)
+            if isinstance(value, list):
+                multi = True
+                for v in value:
+                    if v:
+                        choices.add(v)
+            else:
+                choices.add(value)
+        c = []
+        if not multi:
+            c = [("", "")]
+        c += [(v, v) for v in sorted(list(choices))]
+        cache.set(cache_key, c, settings.CACHE_SMALLTIMEOUT)
         return choices