diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-06-09 17:23:11 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-07-08 09:59:31 +0200 |
| commit | fc542831825fedfdf59d7b8713e457ed168f3a91 (patch) | |
| tree | 01fdc36f18e8828bc413f4a975b1d06a555d82a6 /ishtar_common | |
| parent | fc24549ebdc04b084480502c2ddec82fdd107c40 (diff) | |
| download | Ishtar-fc542831825fedfdf59d7b8713e457ed168f3a91.tar.bz2 Ishtar-fc542831825fedfdf59d7b8713e457ed168f3a91.zip | |
JSON fields: fix multi-value choices fields
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/models_common.py | 2 | ||||
| -rw-r--r-- | ishtar_common/widgets.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ishtar_common/models_common.py b/ishtar_common/models_common.py index ecbabcf7a..aae79c4fe 100644 --- a/ishtar_common/models_common.py +++ b/ishtar_common/models_common.py @@ -1097,7 +1097,7 @@ class JsonData(models.Model, CachedGen): c = [("", "")] c += [(v, v) for v in sorted(list(choices))] cache.set(cache_key, c, settings.CACHE_SMALLTIMEOUT) - return choices + return c class FixAssociated: diff --git a/ishtar_common/widgets.py b/ishtar_common/widgets.py index 1f5a169ba..4852f4ceb 100644 --- a/ishtar_common/widgets.py +++ b/ishtar_common/widgets.py @@ -140,7 +140,7 @@ class Select2DynamicBase(Select2Media): value = value[0] values = value for va in values: - if va not in [key for key, va in choices]: + if va not in [key for key, v in choices]: choices.insert(1, (va, va)) self.choices = choices klass = attrs and attrs.get("class") or "" |