diff options
| -rw-r--r-- | archaeological_warehouse/admin.py | 2 | ||||
| -rw-r--r-- | changelog/en/changelog_2022-06-15.md | 11 | ||||
| -rw-r--r-- | changelog/fr/changelog_2023-01-25.md | 9 | ||||
| -rw-r--r-- | ishtar_common/data_importer.py | 2 |
4 files changed, 22 insertions, 2 deletions
diff --git a/archaeological_warehouse/admin.py b/archaeological_warehouse/admin.py index 78dd5b34e..217d4ad07 100644 --- a/archaeological_warehouse/admin.py +++ b/archaeological_warehouse/admin.py @@ -73,7 +73,7 @@ class ContainerAdmin(HistorizedObjectAdmin, MainGeoDataItem): "container_type", ) list_filter = ("container_type",) - search_fields = ("reference", "container_type", "cached_label", "responsible") + search_fields = ("reference", "container_type__label", "cached_label", "responsible__name") model = models.Container readonly_fields = HistorizedObjectAdmin.readonly_fields + [ "merge_key", diff --git a/changelog/en/changelog_2022-06-15.md b/changelog/en/changelog_2022-06-15.md index 80b2a1591..b623a56d3 100644 --- a/changelog/en/changelog_2022-06-15.md +++ b/changelog/en/changelog_2022-06-15.md @@ -1,4 +1,13 @@ -v4.0.67 - 2023-11-28 +v4.0.68 - 2023-11-30 +-------------------- + +### Bug fixes ### +- admin container: fix search + +### Technical ### +- import: intercept integrity error on post-treatment + +v4.0.67 - 2023-11-29 -------------------- ### Bug fixes ### diff --git a/changelog/fr/changelog_2023-01-25.md b/changelog/fr/changelog_2023-01-25.md index bc31a053c..885bb49bd 100644 --- a/changelog/fr/changelog_2023-01-25.md +++ b/changelog/fr/changelog_2023-01-25.md @@ -1,3 +1,12 @@ +v4.0.68 - 2023-11-30 +-------------------- + +### Corrections de dysfonctionnements ### +- administration contenants : correction de la recherche + +### Technique ### +- import : interception des erreurs d'integrité en post-traitement + v4.0.67 - 2023-11-29 -------------------- diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py index 0f447f957..7bbb0753c 100644 --- a/ishtar_common/data_importer.py +++ b/ishtar_common/data_importer.py @@ -863,6 +863,8 @@ class Importer(object): returned = [returned] for rel in returned: self._add_to_post_save(rel.__class__, rel.pk, idx_line) + except IntegrityError as e: + self.errors.append((idx_line, None, str(e))) except ImporterError as msg: self.errors.append((idx_line, None, msg)) return item |