Safe fallbacks

feincms · Sep 3, 2024 · 90b1563 · 90b1563
1 parent 5727080
commit 90b1563
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/form_designer/models.py b/form_designer/models.py
@@ -182,7 +182,12 @@ def loader(submission, field, choice_dict):
                 value = submission.data[field.name]
             elif (old := field._old_name) is not None and old in submission.data:
                 value = submission.data[old]
-            return choice_dict.get(value, value)
+            try:
+                if isinstance(value, list):
+                    return [choice_dict.get(v, v) for v in value]
+                return choice_dict.get(value, value)
+            except TypeError:  # unhashable types or other, unexpected circumstances
+                return value
 
         def old_name_loader(submission, old_name):
             return submission.data.get(old_name)