deps: Update to Wagtail 7.4 + Changelog

Author: glanzel

.gitignore

@@ -23,6 +23,7 @@ coverage.xml
 *.pot
 
 # Environments
+.venv/
 venv/
 /pyvenv.cfg
 /pip-selfcheck.json

CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 Since version v2306.1 the format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 This project (not yet) adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## v2605.1
+
+### Changed
+
+- update dependency wagtail to v7.4
+- search backend: use `INDEX_PREFIX` instead of deprecated `INDEX`; tolerate `_django_content_type` in Elasticsearch highlights (Wagtail 7.2+ index format)
+
 ## v2604.1
 
 ### Changed

apps/contrib/elasticsearch.py

@@ -38,7 +38,8 @@ def _get_results_from_hits(self, hits):
 
         for hit in hits:
             hs = hit['highlight']
-            hs.pop('content_type')
+            hs.pop('content_type', None)
+            hs.pop('_django_content_type', None)
             if '_all_text_boost_2_0' in hs:
                 # ignore hits from the _all_text field as it doesn't work with
                 # our translations

digitalstrategie/settings/base.py

@@ -203,7 +203,7 @@
     'default': {
         'BACKEND': 'apps.contrib.elasticsearch',
         'URLS': ['http://localhost:9200'],
-        'INDEX': 'wagtail',
+        'INDEX_PREFIX': 'wagtail_',
         'TIMEOUT': 5,
         'OPTIONS': {},
         'INDEX_SETTINGS': {}

requirements/base.txt

@@ -5,7 +5,7 @@ django-csp==3.8
 django-multiselectfield==0.1.13
 django-widget-tweaks==1.5.1
 sentry-sdk==2.58.0
-wagtail==6.3.5
+wagtail==7.4
 whitenoise==6.8.2
 elasticsearch==8.19.3
 wagtail-metadata==5.0.0