fix: Improve placeholder retrieval and admin representation for alias models, fix deletion signal emission, and clean up alias tag behavior. (#292)

* fix: Migration 0005 used manager not available in migration

* fix: get_or_create

* fix: Avoid creating content type

* fix: default_slot_name access

* feat: Add static marker in alias change list

* Update djangocms_alias/admin.py

* fix: Remove debug code

* Only create alias content if user is authenticated

* fix: Show unkown for static alias usage

* Add annotations for py39

Author: fsbraun

djangocms_alias/admin.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from cms.admin.utils import GrouperModelAdmin
 from cms.utils.permissions import get_model_permission_codename
 from cms.utils.urlutils import admin_reverse
@@ -35,13 +37,12 @@
     "AliasContentAdmin",
 ]
 
-alias_admin_list_display = ["content__name", "category", "used", "admin_list_actions"]
+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")
-    alias_admin_list_display.insert(-1, "state_indicator")
 
 
 @admin.register(Category)
@@ -87,9 +88,15 @@ def get_queryset(self, request):
         return qs.annotate(cmsplugins_count=models.Count("cms_plugins"))
 
     @admin.display(description=_("Used"), boolean=True, ordering="cmsplugins_count")
-    def used(self, obj: Alias) -> bool:
+    def used(self, obj: Alias) -> bool | None:
+        if obj.static_code and obj.cmsplugins_count == 0:
+            return None
         return obj.cmsplugins_count > 0
 
+    @admin.display(description=_("Static"), boolean=True)
+    def static(self, obj: Alias) -> bool:
+        return bool(obj.static_code)
+
     def has_delete_permission(self, request: HttpRequest, obj: Alias = None) -> bool:
         # Alias can be deleted by users who can add aliases,
         # if that alias is not referenced anywhere.
@@ -125,13 +132,14 @@ def get_deleted_objects(self, objs, request: HttpRequest) -> tuple:
         return deleted_objects, model_count, perms_needed, protected
 
     def delete_model(self, request: HttpRequest, obj: Alias):
+        pk = obj.pk
         super().delete_model(request, obj)
 
         # Only emit content changes if Versioning is not installed because
         # Versioning emits it' own signals for changes
         if not is_versioning_enabled():
             emit_content_delete(
-                AliasContent.admin_manager.filter(alias=obj),
+                AliasContent.admin_manager.filter(alias_id=pk),
                 sender=self.model,
             )
 

djangocms_alias/models.py

@@ -187,7 +187,7 @@ def get_content(self, language=None, show_draft_content=False):
 
     def get_placeholder(self, language=None, show_draft_content=False):
         content = self.get_content(language=language, show_draft_content=show_draft_content)
-        return getattr(content, "placeholder", None)
+        return content.placeholder if content else None
 
     def get_plugins(self, language=None, show_draft_content=False):
         if not language:

djangocms_alias/templatetags/djangocms_alias_tags.py

@@ -117,11 +117,10 @@ def _get_alias(self, request, static_code, extra_bits):
 
             alias = Alias.objects.create(category=default_category, **alias_creation_kwargs)
 
-        if not alias.get_content(language=self.language, show_draft_content=self.get_draft_content):
-            # If versioning is enabled we can only create the records with a logged-in user / staff member
-            if not self.get_draft_content:
-                return None
-
+        if (
+            not alias.get_content(language=self.language, show_draft_content=self.get_draft_content)
+            and request.user.is_authenticated
+        ):
             alias_content = AliasContent.objects.with_user(request.user).create(
                 alias=alias,
                 name=static_code,

tests/test_models.py

@@ -439,3 +439,19 @@ def test_category_name_unique_for_language(self):
             Category.objects.create(name="Samename B")
             c = Category(name="Samename B")
             self.assertRaises(ValidationError, c.validate_unique)
+
+    def test_get_placeholder(self):
+        alias = AliasModel.objects.create(
+            category=self.category,
+            static_code="static-code",
+            site=None,
+        )
+        AliasContent.objects.with_user(self.superuser).create(
+            alias=alias,
+            name="Static code alias",
+            language=self.language,
+        )
+        placeholder = alias.get_placeholder(self.language, show_draft_content=True)
+
+        self.assertIsNotNone(placeholder)
+        self.assertEqual(placeholder.slot, "static-code")