Merge branch 'master' into fix/no-content

fsbraun · web-flow · commit 3dfb261fec94 · 2026-02-04T10:53:23.000+01:00
diff --git a/djangocms_alias/admin.py b/djangocms_alias/admin.py
@@ -68,7 +68,7 @@ class AliasAdmin(GrouperModelAdmin):
     )
     fields = ("content__name", "category", "site", "content__language")
     readonly_fields = ("static_code",)
-    search_fields = ["content__name"]
+    search_fields = ["content__name", "static_code"]
     autocomplete_fields = ["category", "site"]
     extra_grouping_fields = ("language",)
     EMPTY_CONTENT_VALUE = mark_safe(_("<i>Missing language</i>"))
diff --git a/djangocms_alias/locale/fr/LC_MESSAGES/django.mo b/djangocms_alias/locale/fr/LC_MESSAGES/django.mo
diff --git a/tests/requirements/py311-dj52-cms50-default.txt b/tests/requirements/py311-dj52-cms50-default.txt
@@ -14,7 +14,7 @@ coverage[toml]==7.8.0
     # via
     #   -r requirements.in
     #   pytest-cov
-django==5.2.9
+django==5.2.11
     # via
     #   django-classy-tags
     #   django-cms
diff --git a/tests/requirements/py311-dj52-cms50-versioning.txt b/tests/requirements/py311-dj52-cms50-versioning.txt
@@ -14,7 +14,7 @@ coverage[toml]==7.8.0
     # via
     #   -r requirements.in
     #   pytest-cov
-django==5.2.9
+django==5.2.11
     # via
     #   django-classy-tags
     #   django-cms
diff --git a/tests/requirements/py312-dj52-cms50-default.txt b/tests/requirements/py312-dj52-cms50-default.txt
@@ -14,7 +14,7 @@ coverage[toml]==7.8.0
     # via
     #   -r requirements.in
     #   pytest-cov
-django==5.2.9
+django==5.2.11
     # via
     #   django-classy-tags
     #   django-cms
diff --git a/tests/requirements/py312-dj52-cms50-versioning.txt b/tests/requirements/py312-dj52-cms50-versioning.txt
@@ -14,7 +14,7 @@ coverage[toml]==7.8.0
     # via
     #   -r requirements.in
     #   pytest-cov
-django==5.2.9
+django==5.2.11
     # via
     #   django-classy-tags
     #   django-cms
diff --git a/tests/requirements/py312-dj60-cms50-default.txt b/tests/requirements/py312-dj60-cms50-default.txt
@@ -14,7 +14,7 @@ coverage[toml]==7.10.6
     # via
     #   -r requirements.in
     #   pytest-cov
-django==5.2.9
+django==5.2.11
     # via
     #   django-classy-tags
     #   django-cms
diff --git a/tests/requirements/py312-dj60-cms50-versioning.txt b/tests/requirements/py312-dj60-cms50-versioning.txt
@@ -14,7 +14,7 @@ coverage[toml]==7.10.6
     # via
     #   -r requirements.in
     #   pytest-cov
-django==5.2.9
+django==5.2.11
     # via
     #   django-classy-tags
     #   django-cms
diff --git a/tests/requirements/py313-dj52-cms50-default.txt b/tests/requirements/py313-dj52-cms50-default.txt
@@ -14,7 +14,7 @@ coverage[toml]==7.8.0
     # via
     #   -r requirements.in
     #   pytest-cov
-django==5.2.9
+django==5.2.11
     # via
     #   django-classy-tags
     #   django-cms
diff --git a/tests/requirements/py313-dj52-cms50-versioning.txt b/tests/requirements/py313-dj52-cms50-versioning.txt
@@ -14,7 +14,7 @@ coverage[toml]==7.8.0
     # via
     #   -r requirements.in
     #   pytest-cov
-django==5.2.9
+django==5.2.11
     # via
     #   django-classy-tags
     #   django-cms
diff --git a/tests/requirements/py313-dj60-cms50-default.txt b/tests/requirements/py313-dj60-cms50-default.txt
@@ -14,7 +14,7 @@ coverage[toml]==7.10.6
     # via
     #   -r requirements.in
     #   pytest-cov
-django==5.2.9
+django==5.2.11
     # via
     #   django-classy-tags
     #   django-cms
diff --git a/tests/requirements/py313-dj60-cms50-versioning.txt b/tests/requirements/py313-dj60-cms50-versioning.txt
@@ -14,7 +14,7 @@ coverage[toml]==7.10.6
     # via
     #   -r requirements.in
     #   pytest-cov
-django==5.2.9
+django==5.2.11
     # via
     #   django-classy-tags
     #   django-cms

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ class AliasAdmin(GrouperModelAdmin):`
`68`	`68`	`)`
`69`	`69`	`fields = ("content__name", "category", "site", "content__language")`
`70`	`70`	`readonly_fields = ("static_code",)`
`71`		`- search_fields = ["content__name"]`
	`71`	`+ search_fields = ["content__name", "static_code"]`
`72`	`72`	`autocomplete_fields = ["category", "site"]`
`73`	`73`	`extra_grouping_fields = ("language",)`
`74`	`74`	`EMPTY_CONTENT_VALUE = mark_safe(_("<i>Missing language</i>"))`