diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2023-10-26 18:33:59 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2023-10-26 18:33:59 +0200 |
| commit | 91d5b5967e17282ee54877d6fd93c528e065a70f (patch) | |
| tree | 151f64eca2da6cc6aaad96348e0fd177fc6ee39b | |
| parent | 5f9fdefa537c105762e5fd7c50dbbaa8376ee3fc (diff) | |
| download | Ishtar-91d5b5967e17282ee54877d6fd93c528e065a70f.tar.bz2 Ishtar-91d5b5967e17282ee54877d6fd93c528e065a70f.zip | |
🐛 Operation sheet: fix filter on the table of relations between context records (#5647)
| -rw-r--r-- | archaeological_context_records/models.py | 4 | ||||
| -rw-r--r-- | changelog/en/changelog_2022-06-15.md | 7 | ||||
| -rw-r--r-- | changelog/fr/changelog_2023-01-25.md | 7 | ||||
| -rw-r--r-- | ishtar_common/views_item.py | 9 |
4 files changed, 22 insertions, 5 deletions
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index f464275bf..eb786db74 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -1396,7 +1396,9 @@ class RecordRelations(GeneralRecordRelations, models.Model): } # search parameters - EXTRA_REQUEST_KEYS = {"left_record__operation": "left_record__operation__pk"} + EXTRA_REQUEST_KEYS = { + "left_record__operation": "left_record__operation__pk" + } class Meta: verbose_name = _("Record relation") diff --git a/changelog/en/changelog_2022-06-15.md b/changelog/en/changelog_2022-06-15.md index 545aa7610..8530446fb 100644 --- a/changelog/en/changelog_2022-06-15.md +++ b/changelog/en/changelog_2022-06-15.md @@ -1,3 +1,10 @@ +v4.0.62 - 2023-10-27 +-------------------- + +### Bug fixes ### +- Operation sheet: add missing preventive archaeology fields, improve date format +- Operation sheet: fix filter on the table of relations between context records (#5647) + v4.0.61 - 2023-10-18 -------------------- diff --git a/changelog/fr/changelog_2023-01-25.md b/changelog/fr/changelog_2023-01-25.md index 888cec694..f066e373f 100644 --- a/changelog/fr/changelog_2023-01-25.md +++ b/changelog/fr/changelog_2023-01-25.md @@ -1,3 +1,10 @@ +v4.0.62 - 2023-10-27 +-------------------- + +### Corrections de dysfonctionnements ### +- Fiche opération : affichage de champs préventifs manquants, amélioration d'affichage de date +- Fiche d'opération : correction du filtre sur l'opération sur la table de relations entre unités d'enregistrements liés (#5647) + v4.0.61 - 2023-10-18 -------------------- diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py index eba83275e..e60358913 100644 --- a/ishtar_common/views_item.py +++ b/ishtar_common/views_item.py @@ -1822,10 +1822,11 @@ def get_item( query_parameters = model.get_query_parameters() # get defaults from model - if not extra_request_keys and query_parameters: - my_extra_request_keys = copy(model.EXTRA_REQUEST_KEYS) - for key in query_parameters: - my_extra_request_keys[key] = query_parameters[key].search_query + if not extra_request_keys: + my_extra_request_keys = copy(model.EXTRA_REQUEST_KEYS or {}) + if query_parameters: + for key in query_parameters: + my_extra_request_keys[key] = query_parameters[key].search_query else: my_extra_request_keys = copy(extra_request_keys or {}) if base_request is None and hasattr(model, "BASE_REQUEST"): |