diff options
| -rw-r--r-- | archaeological_finds/models_finds.py | 3 | ||||
| -rw-r--r-- | changelog/en/changelog_2022-06-15.md | 6 | ||||
| -rw-r--r-- | changelog/fr/changelog_2023-01-25.md | 6 |
3 files changed, 14 insertions, 1 deletions
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index f702c97ea..a820e9220 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -2173,8 +2173,9 @@ class Find( if not bf: return values alt_filtr = [k[len("base_find_"):] for k in filtr if k.startswith("base_find_")] + alt_filtr += filtr # use simple and "base_find" prefix notation v = bf.get_values(prefix=prefix, no_values=True, filtr=alt_filtr, **kwargs) - v = dict([('base_find_' + k, v) for k, v in v.items()]) + v.update(dict((('base_find_' + k, v) for k, v in v.items()))) # use simple and "base_find" prefix notation v.update(values) values = v kwargs["no_find"] = True diff --git a/changelog/en/changelog_2022-06-15.md b/changelog/en/changelog_2022-06-15.md index b623a56d3..436aa4c63 100644 --- a/changelog/en/changelog_2022-06-15.md +++ b/changelog/en/changelog_2022-06-15.md @@ -1,3 +1,9 @@ +v4.0.69 - 2023-12-18 +-------------------- + +### Technical ### +- values associated with archaeological find for templates: use "base_find_" prefix and simple prefix (#5695) + v4.0.68 - 2023-11-30 -------------------- diff --git a/changelog/fr/changelog_2023-01-25.md b/changelog/fr/changelog_2023-01-25.md index 885bb49bd..8e79a4cba 100644 --- a/changelog/fr/changelog_2023-01-25.md +++ b/changelog/fr/changelog_2023-01-25.md @@ -1,3 +1,9 @@ +v4.0.69 - 2023-12-18 +-------------------- + +### Technique ### +- valeurs associées au mobilier pour les patrons de documents : utiliser le préfixe "base_find_" et le préfixe simple (#5695) + v4.0.68 - 2023-11-30 -------------------- |