Merge branch 'master' into feat/protect-published

Author: fsbraun

.github/workflows/codeql.yml

@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v4

.github/workflows/docs.yml

@@ -12,14 +12,14 @@ jobs:
     name: build
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
           python-version: '3.11'
           cache: 'pip'
       - name: Cache dependencies
-        uses: actions/cache@v4.3.0
+        uses: actions/cache@v5.0.3
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('docs/requirements.txt') }}
@@ -37,14 +37,14 @@ jobs:
     needs: build
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
           python-version: '3.11'
           cache: 'pip'
       - name: Cache dependencies
-        uses: actions/cache@v4.3.0
+        uses: actions/cache@v5.0.3
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('docs/requirements.txt') }}

.github/workflows/frontend.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Set up Node.js
       uses: actions/setup-node@v6

.github/workflows/lint.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Install uv
       uses: astral-sh/setup-uv@v7

.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.13
       uses: actions/setup-python@v6
       with:

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

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

.github/workflows/test.yml

@@ -42,7 +42,7 @@ jobs:
             python-version: "3.14"
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v6
       with:
@@ -115,7 +115,7 @@ jobs:
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v6
       with:
@@ -182,7 +182,7 @@ jobs:
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v6
       with:
@@ -217,7 +217,7 @@ jobs:
         ]
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v6
       with:
@@ -252,7 +252,7 @@ jobs:
         requirements-file: ['dj60_cms50.txt']
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v6
       with:

djangocms_versioning/admin.py

@@ -47,8 +47,10 @@
     content_is_unlocked_for_user,
     create_version_lock,
     get_admin_url,
+    get_current_site,
     get_editable_url,
     get_latest_admin_viewable_content,
+    get_object_live_url,
     get_preview_url,
     proxy_model,
     remove_version_lock,
@@ -1097,9 +1099,9 @@ def publish_view(self, request, object_id):
         self.message_user(request, _("Version published"))
 
         # Redirect to published?
-        if conf.ON_PUBLISH_REDIRECT == "published":
+        if not requested_redirect and conf.ON_PUBLISH_REDIRECT == "published":
             if hasattr(version.content, "get_absolute_url"):
-                requested_redirect = requested_redirect or version.content.get_absolute_url()
+                redirect_url = get_object_live_url(version.content, site=get_current_site(request)) or redirect_url
 
         return self._internal_redirect(requested_redirect, redirect_url)
 
@@ -1220,7 +1222,7 @@ def edit_redirect_view(self, request, object_id):
             return redirect(version_list_url(version.content))
 
         # Redirect
-        return redirect(get_editable_url(target.content, request.GET.get("force_admin")))
+        return redirect(get_editable_url(target.content, request.GET.get("force_admin"), request.GET))
 
     def revert_view(self, request, object_id):
         """Reverts to the specified version i.e. creates a draft from it."""

djangocms_versioning/cms_toolbars.py

@@ -32,7 +32,9 @@
 from djangocms_versioning.conf import ALLOW_DELETING_VERSIONS, LOCK_VERSIONS
 from djangocms_versioning.constants import DRAFT
 from djangocms_versioning.helpers import (
+    get_current_site,
     get_latest_admin_viewable_content,
+    get_object_live_url,
     version_list_url,
 )
 from djangocms_versioning.models import Version
@@ -105,6 +107,8 @@ def _add_edit_button(self, disabled=False):
                 f"admin:{proxy_model._meta.app_label}_{proxy_model.__name__.lower()}_edit_redirect",
                 args=(version.pk,),
             )
+            if self.request.GET:
+                edit_url += "?" + self.request.GET.urlencode()
             pks_for_grouper = version.versionable.for_content_grouping_values(version.content).values_list(
                 "pk", flat=True
             )
@@ -250,7 +254,10 @@ def _add_view_published_button(self):
         if not published_version:
             return
 
-        url = published_version.get_absolute_url() if hasattr(published_version, "get_absolute_url") else None
+        url = None
+        if hasattr(published_version, "get_absolute_url"):
+            request = self.toolbar.request
+            url = get_object_live_url(published_version, site=get_current_site(request), params=request.GET)
         if url and (self.toolbar.edit_mode_active or self.toolbar.preview_mode_active):
             item = ButtonList(side=self.toolbar.RIGHT)
             item.add_button(

djangocms_versioning/helpers.py

@@ -18,7 +18,7 @@
 from django.http import HttpRequest
 from django.template.loader import render_to_string
 from django.utils.encoding import force_str
-from django.utils.translation import get_language
+from django.utils.translation import get_language, override as force_language
 
 from . import versionables
 from .conf import EMAIL_NOTIFICATIONS_FAIL_SILENTLY
@@ -29,6 +29,21 @@
 except ImportError:
     emit_content_change = None
 
+try:
+    # django CMS >= 5.1
+    from cms.toolbar.utils import get_object_live_url  # noqa F401
+    from cms.utils import get_current_site  # noqa F401
+except ImportError:
+    # cms < 5.1
+    def get_object_live_url(obj, language=None, site=None, params=None) -> str:
+        with force_language(language):
+            return obj.get_absolute_url()
+
+    def get_current_site(request) -> models.Model:
+        from django.contrib.sites.models import Site
+
+        return Site.objects.get_current()
+
 
 def is_editable(content_obj: models.Model, request: HttpRequest) -> bool:
     """Check of content_obj is editable"""
@@ -72,9 +87,7 @@ def _replace_admin_for_model(modeladmin: type[admin.ModelAdmin], mixin: type, ad
     admin_site.register(modeladmin.model, new_admin_class)
 
 
-def replace_admin_for_models(
-    pairs: Iterable[tuple[type[models.Model], type]], admin_site: admin.AdminSite | None = None
-):
+def replace_admin_for_models(pairs: tuple[type[models.Model], type], admin_site: admin.AdminSite | None = None):
     """
     :param pairs: Iterable of (model class, admin mixin class) tuples
     :param admin_site: AdminSite instance
@@ -252,13 +265,15 @@ def is_content_editable(placeholder: Placeholder, user: models.Model) -> bool:
     return version.state == DRAFT
 
 
-def get_editable_url(content_obj, force_admin=False):
+def get_editable_url(content_obj, force_admin=False, params=None):
     """If the object is editable the cms editable view should be used, with the toolbar.
     This method provides the URL for it.
     """
     if is_editable_model(content_obj.__class__) and not force_admin:
         language = getattr(content_obj, "language", None)
         url = get_object_edit_url(content_obj, language)
+        if params:
+            url += "?" + params.urlencode()
     # Or else, the standard edit view should be used
     else:
         url = admin_reverse(