Merge branch 'master' into fix-multi-site

Author: fsbraun

.github/workflows/frontend.yml

@@ -19,7 +19,7 @@ jobs:
     - uses: actions/checkout@v5
 
     - name: Set up Node.js
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v6
       with:
         node-version: '24'
         cache: 'npm'

.github/workflows/lint.yml

@@ -12,7 +12,7 @@ jobs:
     - uses: actions/checkout@v5
 
     - name: Install uv
-      uses: astral-sh/setup-uv@v5
+      uses: astral-sh/setup-uv@v7
 
     - name: Install ruff
       run: uv tool install ruff

.github/workflows/test.yml

@@ -48,7 +48,7 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install uv
-      uses: astral-sh/setup-uv@v5
+      uses: astral-sh/setup-uv@v7
     - name: Install dependencies
       run: |
         sudo apt install gettext gcc -y
@@ -121,7 +121,7 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install uv
-      uses: astral-sh/setup-uv@v5
+      uses: astral-sh/setup-uv@v7
     - name: Install dependencies
       run: |
         uv pip install --system -r tests/requirements/${{ matrix.requirements-file }}
@@ -188,7 +188,7 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install uv
-      uses: astral-sh/setup-uv@v5
+      uses: astral-sh/setup-uv@v7
     - name: Install dependencies
       run: |
         uv pip install --system -r tests/requirements/${{ matrix.requirements-file }}
@@ -223,7 +223,7 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install uv
-      uses: astral-sh/setup-uv@v5
+      uses: astral-sh/setup-uv@v7
     - name: Install dependencies
       run: |
         uv pip install --system -r tests/requirements/${{ matrix.requirements-file }}
@@ -258,7 +258,7 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install uv
-      uses: astral-sh/setup-uv@v5
+      uses: astral-sh/setup-uv@v7
     - name: Install dependencies
       run: |
         uv pip install --system -r tests/requirements/${{ matrix.requirements-file }}

README.rst

@@ -52,7 +52,7 @@ Testing
 
 To run all the tests the only thing you need to do is run::
 
-    pip install -r tests/requirements.txt
+    pip install -r tests/requirements/requirements_dev.txt
     python test_settings.py
 
 

djangocms_versioning/cms_toolbars.py

@@ -57,9 +57,7 @@ def _is_versioned(self):
         versioning
         """
         versioning_extension = apps.get_app_config("djangocms_versioning").cms_extension
-        return versioning_extension.is_content_model_versioned(
-            self.toolbar.obj.__class__
-        )
+        return versioning_extension.is_content_model_versioned(self.toolbar.obj.__class__)
 
     def _get_proxy_model(self):
         """Helper method to get the proxy model class for the content
@@ -68,8 +66,7 @@ def _get_proxy_model(self):
         return self._get_versionable().version_model_proxy
 
     def _add_publish_button(self):
-        """Helper method to add a publish button to the toolbar
-        """
+        """Helper method to add a publish button to the toolbar"""
         # Check if object is registered with versioning otherwise don't add
         if not self._is_versioned():
             return
@@ -101,8 +98,7 @@ def add_edit_button(self):
         self._add_unlock_button()
 
     def _add_edit_button(self, disabled=False):
-        """Helper method to add an edit button to the toolbar
-        """
+        """Helper method to add an edit button to the toolbar"""
         item = ButtonList(side=self.toolbar.RIGHT)
         proxy_model = self._get_proxy_model()
         version = Version.objects.get_for_content(self.toolbar.obj)
@@ -111,9 +107,9 @@ def _add_edit_button(self, disabled=False):
                 f"admin:{proxy_model._meta.app_label}_{proxy_model.__name__.lower()}_edit_redirect",
                 args=(version.pk,),
             )
-            pks_for_grouper = version.versionable.for_content_grouping_values(
-                version.content
-            ).values_list("pk", flat=True)
+            pks_for_grouper = version.versionable.for_content_grouping_values(version.content).values_list(
+                "pk", flat=True
+            )
             content_type = ContentType.objects.get_for_model(version.content)
             draft_exists = Version.objects.filter(
                 object_id__in=pks_for_grouper, content_type=content_type, state=DRAFT
@@ -127,8 +123,7 @@ def _add_edit_button(self, disabled=False):
             self.toolbar.add_item(item)
 
     def _add_unlock_button(self):
-        """Helper method to add an edit button to the toolbar
-        """
+        """Helper method to add an edit button to the toolbar"""
         if LOCK_VERSIONS and self._is_versioned():
             item = ButtonList(side=self.toolbar.RIGHT)
             proxy_model = self._get_proxy_model()
@@ -166,8 +161,7 @@ def _add_lock_message(self):
             self.toolbar.add_item(lock_message, position=0)
 
     def _add_revert_button(self, disabled=False):
-        """Helper method to add a revert button to the toolbar
-         """
+        """Helper method to add a revert button to the toolbar"""
         # Check if object is registered with versioning otherwise don't add
         if not self._is_versioned():
             return
@@ -188,8 +182,7 @@ def _add_revert_button(self, disabled=False):
             self.toolbar.add_item(item)
 
     def _add_versioning_menu(self):
-        """ Helper method to add version menu in the toolbar
-        """
+        """Helper method to add version menu in the toolbar"""
         # Check if object is registered with versioning otherwise don't add
         if not self._is_versioned():
             return
@@ -217,13 +210,15 @@ def _add_versioning_menu(self):
                 proxy_model = self._get_proxy_model()
                 url = reverse(
                     f"admin:{proxy_model._meta.app_label}_{proxy_model.__name__.lower()}_compare",
-                    args=(version.source.pk,)
+                    args=(version.source.pk,),
                 )
 
-                url += "?" + urlencode({
-                    "compare_to": version.pk,
-                    "back": self.toolbar.request_path,
-                })
+                url += "?" + urlencode(
+                    {
+                        "compare_to": version.pk,
+                        "back": self.toolbar.request_path,
+                    }
+                )
                 versioning_menu.add_link_item(name, url=url)
                 # Discard changes menu entry (wrt to source)
                 if version.check_discard.as_bool(self.request.user):  # pragma: no cover
@@ -232,26 +227,22 @@ def _add_versioning_menu(self):
                         _("Discard Changes"),
                         url=reverse(
                             f"admin:{proxy_model._meta.app_label}_{proxy_model.__name__.lower()}_discard",
-                            args=(version.pk,)
-                        )
+                            args=(version.pk,),
+                        ),
                     )
 
     def _get_published_page_version(self):
-        """Returns a published page if one exists for the toolbar object
-        """
+        """Returns a published page if one exists for the toolbar object"""
         language = self.current_lang
 
         # Exit the current toolbar object is not a Page / PageContent instance
         if not isinstance(self.toolbar.obj, PageContent) or not self.page:
             return
 
-        return PageContent.objects.filter(
-            page=self.page, language=language
-        ).select_related("page").first()
+        return PageContent.objects.filter(page=self.page, language=language).select_related("page").first()
 
     def _add_view_published_button(self):
-        """Helper method to add a publish button to the toolbar
-        """
+        """Helper method to add a publish button to the toolbar"""
         # Check if object is registered with versioning otherwise don't add
         if not self._is_versioned():
             return
@@ -351,50 +342,38 @@ def override_language_menu(self):
                     language_menu.add_link_item(name, url=url, active=self.current_lang == code)
 
     def change_language_menu(self):
-        if self.toolbar.edit_mode_active and self.page:
-            can_change = page_permissions.user_can_change_page(
+        can_change = (
+            self.page
+            and page_permissions.user_can_change_page(
                 user=self.request.user, page=self.page, site=self.current_site
             )
-        else:
-            can_change = False
+        )
 
         if can_change:
             language_menu = self.toolbar.get_menu(LANGUAGE_MENU_IDENTIFIER)
             if not language_menu:
                 return None
 
             languages = get_language_dict(self.current_site.pk)
-            remove = [
-                (code, languages.get(code, code))
-                for code in self.page.get_languages()
-                if code in languages
-            ]
-            add = [
-                code
-                for code in languages.items()
-                if code not in remove
-            ]
+            remove = [(code, languages.get(code, code)) for code in self.page.get_languages() if code in languages]
+            add = [code for code in languages.items() if code not in remove]
             copy = [
-                (code, name)
-                for code, name in languages.items()
-                if code != self.current_lang and (code, name) in remove
+                (code, name) for code, name in languages.items() if code != self.current_lang and (code, name) in remove
             ]
 
+            # ADD TRANSLATION — only if user has change permission
             if add:
                 language_menu.add_break(ADD_PAGE_LANGUAGE_BREAK)
 
-                add_plugins_menu = language_menu.get_or_create_menu(
-                    f"{LANGUAGE_MENU_IDENTIFIER}-add", _("Add Translation")
-                )
+                add_plugins_menu = language_menu.get_or_create_menu(f"{LANGUAGE_MENU_IDENTIFIER}-add", _("Add Translation"))  # noqa: E501
 
                 page_add_url = admin_reverse("cms_pagecontent_add")
 
                 for code, name in add:
-                    url = add_url_parameters(
-                        page_add_url, cms_page=self.page.pk, language=code
-                    )
+                    url = add_url_parameters(page_add_url, cms_page=self.page.pk, language=code)
                     add_plugins_menu.add_modal_item(name, url=url)
 
+            # DELETE TRANSLATION — only if user has change permission
             if remove and ALLOW_DELETING_VERSIONS and CMS_SUPPORTS_DELETING_TRANSLATIONS:
                 remove_plugins_menu = language_menu.get_or_create_menu(
                     f"{LANGUAGE_MENU_IDENTIFIER}-del", _("Delete Translation")
@@ -408,12 +387,17 @@ def change_language_menu(self):
                         on_close = REFRESH_PAGE
                         if self.toolbar.get_object() == pagecontent and not disabled:
                             other_content = next(
-                                (self.page.get_admin_content(lang) for lang in self.page.get_languages()
-                                 if lang != pagecontent.language and lang in languages), None)
+                                (
+                                    self.page.get_admin_content(lang)
+                                    for lang in self.page.get_languages()
+                                    if lang != pagecontent.language and lang in languages
+                                ),
+                                None,
+                            )
                             on_close = get_object_preview_url(other_content)
                         remove_plugins_menu.add_modal_item(name, url=url, disabled=disabled, on_close=on_close)
-
-            if copy:
+            # COPY ALL PLUGINS — only if user can change AND in edit mode
+            if self.toolbar.edit_mode_active and copy:
                 copy_plugins_menu = language_menu.get_or_create_menu(
                     f"{LANGUAGE_MENU_IDENTIFIER}-copy", _("Copy all plugins")
                 )
@@ -426,9 +410,11 @@ def change_language_menu(self):
                     if page_content:  # Only offer to copy if content for source language exists
                         page_copy_url = admin_reverse("cms_pagecontent_copy_language", args=(page_content.pk,))
                         copy_plugins_menu.add_ajax_item(
-                            title % name, action=page_copy_url,
+                            title % name,
+                            action=page_copy_url,
                             data={"source_language": code, "target_language": self.current_lang},
-                            question=question % name, on_success=self.toolbar.REFRESH_PAGE
+                            question=question % name,
+                            on_success=self.toolbar.REFRESH_PAGE,
                         )
                         item_added = True
                     if not item_added:  # pragma: no cover
@@ -471,8 +457,7 @@ def replace_toolbar(old, new):
     new_name = ".".join((new.__module__, new.__name__))
     old_name = ".".join((old.__module__, old.__name__))
     toolbar_pool.toolbars = OrderedDict(
-        (new_name, new) if name == old_name else (name, toolbar)
-        for name, toolbar in toolbar_pool.toolbars.items()
+        (new_name, new) if name == old_name else (name, toolbar) for name, toolbar in toolbar_pool.toolbars.items()
     )