feat: Allow djangocms-core to offer a "New draft" button for published placeholders

djangocms_versioning/helpers.py

@@ -17,8 +17,9 @@
 from django.db import models
 from django.http import HttpRequest
 from django.template.loader import render_to_string
+from django.urls import reverse
 from django.utils.encoding import force_str
-from django.utils.translation import get_language
+from django.utils.translation import get_language, gettext as _
 
 from . import versionables
 from .conf import EMAIL_NOTIFICATIONS_FAIL_SILENTLY
@@ -243,12 +244,21 @@ def is_content_editable(placeholder: Placeholder, user: models.Model) -> bool:
     :return: Boolean
     """
     try:
-        versionables.for_content(placeholder.source)
+        proxy_model = versionables.for_content(placeholder.source).version_model_proxy
     except KeyError:
         return True
     from .models import Version
 
     version = Version.objects.get_for_content(placeholder.source)
+    if version.state == DRAFT:
+        return True
+    if version.check_edit_redirect.as_bool(user):
+        placeholder.new_draft = _("Create new draft to edit")
+        placeholder.new_draft_method = "cms-form-post-method"
+        placeholder.new_draft_url = reverse(
+            f"admin:{proxy_model._meta.app_label}_{proxy_model._meta.model_name}_edit_redirect",
+            args=(version.pk,),
+        )
     return version.state == DRAFT
 
 

tests/test_checks.py

@@ -49,3 +49,63 @@ def test_check_unversioned_model(self):
 class CheckInjectTestCase(CMSTestCase):
     def test_draft_state_check_is_injected_into_default_checks(self):
         self.assertIn(is_content_editable, PlaceholderRelationField.default_checks)
+
+
+class NewDraftPropertiesTestCase(CMSTestCase):
+    def test_new_draft_properties_set_for_published_placeholder(self):
+        """Test that new_draft properties are set on published placeholders"""
+        user = self.get_superuser()
+        version = PageVersionFactory(state=PUBLISHED)
+        placeholder = PlaceholderFactory(source=version.content)
+
+        # Call is_content_editable which should set the new_draft properties
+        is_content_editable(placeholder, user)
+
+        # Check that new_draft properties are set
+        self.assertTrue(hasattr(placeholder, "new_draft"))
+        self.assertTrue(hasattr(placeholder, "new_draft_method"))
+        self.assertTrue(hasattr(placeholder, "new_draft_url"))
+        self.assertEqual(placeholder.new_draft_method, "cms-form-post-method")
+        self.assertIn("edit-redirect", placeholder.new_draft_url)
+
+    def test_new_draft_properties_not_set_for_archived_placeholder(self):
+        """Test that new_draft properties are NOT set on archived placeholders"""
+        user = self.get_superuser()
+        version = PageVersionFactory(state=ARCHIVED)
+        placeholder = PlaceholderFactory(source=version.content)
+
+        # Call is_content_editable which should NOT set the new_draft properties for archived
+        is_content_editable(placeholder, user)
+
+        # Check that new_draft properties are NOT set
+        self.assertFalse(hasattr(placeholder, "new_draft"))
+        self.assertFalse(hasattr(placeholder, "new_draft_method"))
+        self.assertFalse(hasattr(placeholder, "new_draft_url"))
+
+    def test_new_draft_properties_not_set_for_unpublished_placeholder(self):
+        """Test that new_draft properties are NOT set on unpublished placeholders"""
+        user = self.get_superuser()
+        version = PageVersionFactory(state=UNPUBLISHED)
+        placeholder = PlaceholderFactory(source=version.content)
+
+        # Call is_content_editable which should NOT set the new_draft properties for unpublished
+        is_content_editable(placeholder, user)
+
+        # Check that new_draft properties are NOT set
+        self.assertFalse(hasattr(placeholder, "new_draft"))
+        self.assertFalse(hasattr(placeholder, "new_draft_method"))
+        self.assertFalse(hasattr(placeholder, "new_draft_url"))
+
+    def test_new_draft_properties_not_set_for_draft_placeholder(self):
+        """Test that new_draft properties are NOT set on draft placeholders (already editable)"""
+        user = self.get_superuser()
+        version = PageVersionFactory(state=DRAFT)
+        placeholder = PlaceholderFactory(source=version.content)
+
+        # Call is_content_editable which should NOT set the new_draft properties for drafts
+        is_content_editable(placeholder, user)
+
+        # Check that new_draft properties are NOT set (draft is already editable)
+        self.assertFalse(hasattr(placeholder, "new_draft"))
+        self.assertFalse(hasattr(placeholder, "new_draft_method"))
+        self.assertFalse(hasattr(placeholder, "new_draft_url"))