[WIP] django-cms 4.1 compatible for version locking

.github/workflows/test.yml

@@ -16,10 +16,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ 3.8, 3.9, '3.10' ]
+        python-version: [ 3.9, '3.10', '3.11' ]
         requirements-file: [
-            dj32_cms40.txt,
-            dj42_cms40.txt,
+            dj42_cms41.txt,
         ]
 
     steps:

CHANGELOG.rst

@@ -4,6 +4,12 @@ Changelog
 
 Unreleased
 ==========
+* Dropped Support for Python 3.8
+* Dropped Support for Django CMS < 4.1
+* Introduced Django CMS 4.1 support.
+* delete `VersionLock` as It's moved to Version.locked_by field.
+* monkeypatch `ChangeListActionsMixin` in cms.admin.utils to support action list burger menu.
+
 
 1.3.0 (2024-05-16)
 ==================

djangocms_version_locking/apps.py

@@ -7,4 +7,4 @@ class VersionLockingConfig(AppConfig):
     verbose_name = _("django CMS Version Locking")
 
     def ready(self):
-        from .monkeypatch import checks, cms_toolbars, models  # noqa: F401
+        from .monkeypatch import cms_toolbars  # noqa: F401

djangocms_version_locking/cms_config.py

@@ -1,23 +1,24 @@
-from django.template.loader import render_to_string
 from django.utils.html import format_html
+from django.utils.safestring import mark_safe
 
 from cms.app_base import CMSAppConfig, CMSAppExtension
 
 from djangocms_alias.models import AliasContent
 from djangocms_versioning.constants import DRAFT
-
-from djangocms_version_locking.helpers import version_is_locked
+from djangocms_versioning.helpers import version_is_locked
 
 
 def add_alias_version_lock(obj, field):
-    version = obj.versions.all()[0]
+    # add None obj check, if the legacy data has empty value.
     lock_icon = ""
-    if version.state == DRAFT and version_is_locked(version):
-        lock_icon = render_to_string("djangocms_version_locking/admin/locked_mixin_icon.html")
+    if obj:
+        version = obj.versions.all()[0]
+        if version.state == DRAFT and version_is_locked(version):
+            lock_icon = mark_safe('<span class="cms-icon cms-icon-lock"></span>')
     return format_html(
         "{is_locked}{field_value}",
         is_locked=lock_icon,
-        field_value=getattr(obj, field),
+        field_value=getattr(obj, field, '-'),
     )
 
 
@@ -27,7 +28,12 @@ def __init__(self):
         # is registered and can be overriden without requiring a strict load order
         # in the INSTALLED_APPS setting in a projects settings.py. This is why this patch
         # Isn't loaded from: VersionLockingConfig.ready
-        from .monkeypatch import admin as monkeypatch_admin  # noqa: F401
+        from .monkeypatch import (  # noqa: F401
+            admin as monkeypatched_version_admin,
+        )
+        from .monkeypatch.djangocms_alias import (  # noqa: F401
+            admin as monkeypatched_alias_admin,
+        )
 
     def configure_app(self, cms_config):
         pass

djangocms_version_locking/migrations/0002_migrate_locked_by.py

@@ -0,0 +1,28 @@
+# Generated by Django 4.2.8 on 2024-11-07 07:21
+
+from django.db import migrations
+
+
+def forwards(apps, schema_editor):
+    db_alias = schema_editor.connection.alias
+    Version = apps.get_model("djangocms_versioning", "Version")
+    VersionLock = apps.get_model("djangocms_version_locking", "VersionLock")
+
+    version_lock_qs = VersionLock.objects.using(db_alias).all()
+    versions = set(Version.objects.using(db_alias).filter(pk__in=version_lock_qs.values('version')))
+
+    for version in versions:
+        version.locked_by = version.versionlock.created_by
+    Version.objects.using(db_alias).bulk_update(versions, ['locked_by']) 
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('djangocms_version_locking', '0001_initial'),
+        ('djangocms_versioning', '0017_merge_20230514_1027'),
+    ]
+
+    operations = [
+        migrations.RunPython(forwards, reverse_code=migrations.RunPython.noop)
+    ]

djangocms_version_locking/migrations/0003_delete_versionlock.py

@@ -0,0 +1,16 @@
+# Generated by Django 4.2.16 on 2024-11-07 14:33
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('djangocms_version_locking', '0002_migrate_locked_by'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='VersionLock',
+        ),
+    ]