Merge branch 'master' into feat/cms-5.1-support

Author: fsbraun

.github/workflows/codeql.yml

@@ -24,19 +24,19 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v4
         with:
           languages: ${{ matrix.language }}
           queries: +security-and-quality
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v3
+        uses: github/codeql-action/autobuild@v4
         if: ${{ matrix.language == 'javascript' || matrix.language == 'python' }}
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v4
         with:
           category: "/language:${{ matrix.language }}"

.github/workflows/lint.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - run: python -Im pip install --user ruff
 

.github/workflows/publish-to-live-pypi.yml

@@ -15,7 +15,7 @@ jobs:
     permissions:
       id-token: write
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Set up Python 3.10
       uses: actions/setup-python@v6
       with:

.github/workflows/publish-to-test-pypi.yml

@@ -15,7 +15,7 @@ jobs:
     permissions:
       id-token: write
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Set up Python 3.10
       uses: actions/setup-python@v6
       with:

.github/workflows/test.yml

@@ -20,7 +20,7 @@ jobs:
           - '3.13'
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v6
@@ -49,7 +49,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: unit-tests
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - uses: actions/setup-python@v6
         with:
@@ -93,7 +93,7 @@ jobs:
         ]
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Set up Python ${{ matrix.python-version }}
 
       uses: actions/setup-python@v6

.pre-commit-config.yaml

@@ -9,7 +9,7 @@ ci:
 
 repos:
   -  repo: https://github.com/asottile/pyupgrade
-     rev: v3.21.0
+     rev: v3.21.2
      hooks:
        -  id: pyupgrade
           args: ["--py38-plus"]
@@ -21,7 +21,7 @@ repos:
         args: [--target-version, "3.2"]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.3
+    rev: v0.14.7
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

djangocms_alias/admin.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from collections.abc import Iterable
+
 from cms.admin.utils import GrouperModelAdmin
 from cms.utils.permissions import get_model_permission_codename
 from cms.utils.urlutils import admin_reverse
@@ -16,7 +18,6 @@
 from django.utils.translation import gettext_lazy as _
 from parler.admin import TranslatableAdmin
 
-from .cms_config import AliasCMSConfig
 from .constants import (
     CHANGE_ALIAS_URL_NAME,
     DELETE_ALIAS_URL_NAME,
@@ -37,13 +38,6 @@
     "AliasContentAdmin",
 ]
 
-alias_admin_list_display = ["content__name", "category", "static", "used", "admin_list_actions"]
-djangocms_versioning_enabled = AliasCMSConfig.djangocms_versioning_enabled
-
-if djangocms_versioning_enabled:
-    alias_admin_list_display.insert(-1, "get_author")
-    alias_admin_list_display.insert(-1, "get_modified_date")
-
 
 @admin.register(Category)
 class CategoryAdmin(TranslatableAdmin):
@@ -64,7 +58,7 @@ def save_model(self, request, obj, form, change):
 
 @admin.register(Alias)
 class AliasAdmin(GrouperModelAdmin):
-    list_display = alias_admin_list_display
+    list_display = ["content__name", "category", "static", "used", "admin_list_actions"]
     list_display_links = None
     list_filter = (
         SiteFilter,
@@ -82,11 +76,20 @@ def get_actions_list(self) -> list:
         """Add alias usage list actions"""
         return super().get_actions_list() + [self._get_alias_usage_link, self._get_alias_delete_link]
 
-    def get_queryset(self, request):
+    def get_queryset(self, request: HttpRequest) -> models.QuerySet:
         qs = super().get_queryset(request)
         # Annotate each Alias with a boolean indicating if related cmsplugins exist
         return qs.annotate(cmsplugins_count=models.Count("cms_plugins"))
 
+    def get_list_display(self, request: HttpRequest) -> Iterable[str]:
+        list_display = super().get_list_display(request)
+        list_display = list(list_display)
+        if hasattr(self, "get_author"):
+            list_display.insert(-1, "get_author")
+        if hasattr(self, "get_modified_date"):
+            list_display.insert(-1, "get_modified_date")
+        return list_display
+
     @admin.display(description=_("Used"), boolean=True, ordering="cmsplugins_count")
     def used(self, obj: Alias) -> bool | None:
         if obj.static_code and obj.cmsplugins_count == 0:

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.8
+django==5.2.9
     # via
     #   django-classy-tags
     #   django-cms

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.8
+django==5.2.9
     # via
     #   django-classy-tags
     #   django-cms

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.8
+django==5.2.9
     # via
     #   django-classy-tags
     #   django-cms