Merge branch 'master' into feat/python-migration-matrix

Author: fsbraun

.github/workflows/codeql.yml

@@ -27,16 +27,16 @@ jobs:
         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/test.yml

@@ -39,7 +39,7 @@ jobs:
         run: tox --py current
 
       - name: Upload coverage data
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: coverage-data-${{ matrix.python-version }}
           include-hidden-files: true
@@ -60,7 +60,7 @@ jobs:
         run: python -m pip install --upgrade coverage[toml]
 
       - name: Download data
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
         with:
           path: ${{ github.workspace }}
           pattern: coverage-data-*
@@ -74,7 +74,7 @@ jobs:
 
       - name: Upload HTML report
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: html-report
           path: htmlcov

.pre-commit-config.yaml

@@ -21,7 +21,7 @@ repos:
         args: [--target-version, "3.2"]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.7
+    rev: v0.14.14
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

CHANGELOG.rst

@@ -2,6 +2,13 @@
 Changelog
 =========
 
+3.0.3 (2026-01-13)
+==================
+
+* fix: Admin complained about missing methods get_author and get_modified_date by @fsbraun in https://github.com/django-cms/djangocms-alias/pull/307
+* fix: If static alias has no name, use static code as name by @fsbraun in https://github.com/django-cms/djangocms-alias/pull/326
+
+
 3.0.2 (2025-10-08)
 ==================
 

djangocms_alias/__init__.py

@@ -3,4 +3,4 @@
 A reference can be added to any placeholder using the Alias plugin.
 """
 
-__version__ = "3.0.2"
+__version__ = "3.0.3"

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,
@@ -73,7 +67,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>"))
@@ -82,11 +76,24 @@ 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=_("Name"), ordering=models.functions.Lower("contents__name"))
+    def content_name(self, obj: Alias) -> str:
+        return self.get_content_field(obj, "name") or obj.static_code or self.EMPTY_CONTENT_VALUE
+
     @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: