Merge branch 'develop' into fix/gh-7654-sideframe-hsitory-nav-button-wrap

Author: wesleyboar

.github/workflows/docs.yml

@@ -1,6 +1,6 @@
 name: Docs
 
-on: [push, pull_request]
+on: pull_request
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/frontend.yml

@@ -1,6 +1,6 @@
 name: django CMS frontend.yml
 
-on: [push, pull_request]
+on: pull_request
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/lint-pr.yml

@@ -15,6 +15,6 @@ jobs:
     name: Validate PR title
     runs-on: ubuntu-latest
     steps:
-      - uses: amannn/action-semantic-pull-request@v4
+      - uses: amannn/action-semantic-pull-request@v5.4.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/linters.yml

@@ -1,6 +1,6 @@
 name: django CMS linters.yml
 
-on: [push, pull_request]
+on: pull_request
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/new_contributor_pr.yml

@@ -0,0 +1,25 @@
+name: New contributor message
+
+on:
+  pull_request_target:
+    types: [opened]
+
+permissions:
+  pull-requests: write
+
+jobs:
+  build:
+    name: Hello new contributor
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/first-interaction@v1
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          pr-message: |
+            Hello! Thank you for your contribution! 🎉
+
+            As it's your first contribution be sure to check out the [contribution docs](https://docs.django-cms.org/en/latest/contributing/index.html).
+
+            If you're a Slack user and haven't joined us, please do [here](https://www.django-cms.org/slack)!
+
+            Welcome aboard ⛵️!

.github/workflows/releases.yml

@@ -0,0 +1,24 @@
+name: Comment on PRs into release/* branches
+
+on:
+  pull_request:
+    types: [opened, reopened]
+    branches:
+      - release/*
+
+jobs:
+  comment:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+      - name: Comment on PR
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          script: |
+            try { github.rest.issues.createComment({
+              issue_number: context.issues.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: '👋 Hi there!\n\nPlease remember to **MERGE COMMIT** pull requests from `develop` or `develop-4`!\n\n**Do not SQUASH** commits to preserve history for the changelog.'
+            }) } catch(e) { console.log(e) } 

.github/workflows/test.yml

@@ -1,13 +1,13 @@
 name: django CMS test.yml
 
-on: [push, pull_request]
+on: pull_request
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
-  database-postgres:
+  postgres:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -18,10 +18,16 @@ jobs:
           django-4.0.txt,
           django-4.1.txt,
           django-4.2.txt,
+          django-5.0.txt
         ]
         os: [
           ubuntu-20.04,
         ]
+        exclude:
+          - requirements-file: django-5.0.txt
+            python-version: 3.8
+          - requirements-file: django-5.0.txt
+            python-version: 3.9
 
     services:
       postgres:
@@ -59,7 +65,7 @@ jobs:
         DATABASE_URL: postgres://postgres:postgres@127.0.0.1/postgres
 
 
-  database-mysql:
+  mysql:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -70,10 +76,16 @@ jobs:
           django-4.0.txt,
           django-4.1.txt,
           django-4.2.txt,
+          django-5.0.txt
         ]
         os: [
           ubuntu-20.04,
         ]
+        exclude:
+          - requirements-file: django-5.0.txt
+            python-version: 3.8
+          - requirements-file: django-5.0.txt
+            python-version: 3.9
 
     services:
       mysql:
@@ -111,7 +123,7 @@ jobs:
       env:
         DATABASE_URL: mysql://root@127.0.0.1/djangocms_test
 
-  database-sqlite:
+  sqlite:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -122,10 +134,16 @@ jobs:
           django-4.0.txt,
           django-4.1.txt,
           django-4.2.txt,
+          django-5.0.txt
         ]
         os: [
           ubuntu-20.04,
         ]
+        exclude:
+          - requirements-file: django-5.0.txt
+            python-version: 3.8
+          - requirements-file: django-5.0.txt
+            python-version: 3.9
 
     steps:
     - uses: actions/checkout@v3

cms/cms_toolbars.py

@@ -16,6 +16,7 @@
 from cms.toolbar_base import CMSToolbar
 from cms.toolbar_pool import toolbar_pool
 from cms.utils import get_language_from_request, page_permissions
+from cms.utils.compat import DJANGO_4_2
 from cms.utils.conf import get_cms_setting
 from cms.utils.i18n import get_language_dict, get_language_tuple
 from cms.utils.page_permissions import user_can_change_page, user_can_delete_page, user_can_publish_page
@@ -225,7 +226,7 @@ def add_logout_button(self, parent):
             action=admin_reverse('logout'),
             active=True,
             on_success=on_success,
-            method='GET',
+            method='GET' if DJANGO_4_2 else 'POST',
         )
 
     def add_language_menu(self):

cms/forms/fields.py

@@ -1,12 +1,14 @@
 from django import forms
 from django.contrib.admin.widgets import RelatedFieldWidgetWrapper
 from django.core.validators import EMPTY_VALUES
+from django.forms import ChoiceField
 from django.utils.translation import gettext_lazy as _
 
 from cms.forms.utils import get_page_choices, get_site_choices
 from cms.forms.validators import validate_url_extra
 from cms.forms.widgets import PageSelectWidget, PageSmartLinkWidget
 from cms.models.pagemodel import Page
+from cms.utils.compat import DJANGO_4_2
 
 
 class SuperLazyIterator:
@@ -18,11 +20,20 @@ def __iter__(self):
 
 
 class LazyChoiceField(forms.ChoiceField):
-    def _set_choices(self, value):
-        # we overwrite this function so no list(value) is called
-        self._choices = self.widget.choices = value
 
-    choices = property(forms.ChoiceField._get_choices, _set_choices)
+
+    @property
+    def choices(self):
+        return super().choices()
+
+    @choices.setter
+    def choices(self, value):
+        # we overwrite this function so no list(value) or normalize_choices(value) is called
+        # also, do not call the widget's setter as of Django 5
+        if DJANGO_4_2:
+            self._choices = self.widget.choices = value
+        else:
+            self._choices = self.widget._choices = value
 
 
 class PageSelectFormField(forms.MultiValueField):
@@ -38,14 +49,12 @@ def __init__(self, queryset=None, empty_label="---------", cache_choices=False,
         errors = self.default_error_messages.copy()
         if 'error_messages' in kwargs:
             errors.update(kwargs['error_messages'])
-        site_choices = SuperLazyIterator(get_site_choices)
-        page_choices = SuperLazyIterator(get_page_choices)
         self.limit_choices_to = limit_choices_to
         kwargs['required'] = required
         kwargs.pop('blank', None)
         fields = (
-            LazyChoiceField(choices=site_choices, required=False, error_messages={'invalid': errors['invalid_site']}),
-            LazyChoiceField(choices=page_choices, required=False, error_messages={'invalid': errors['invalid_page']}),
+            ChoiceField(choices=get_site_choices, required=False, error_messages={'invalid': errors['invalid_site']}),
+            ChoiceField(choices=get_page_choices, required=False, error_messages={'invalid': errors['invalid_page']}),
         )
         super().__init__(fields, *args, **kwargs)
 

cms/management/commands/subcommands/tree.py

@@ -22,15 +22,24 @@ def get_descendants(root):
 
 
 class FixTreeCommand(SubcommandsCommand):
-    help_string = 'Repairing Materialized Path Tree for Pages'
+    help_string = 'Repairing Materialized Path Tree for Pages and Plugins'
     command_name = 'fix-tree'
 
+    def add_arguments(self, parser):
+        parser.add_argument(
+            '--fix-paths',
+            action='store_true',
+            default=False,
+            help='Fix paths for pages and plugins - takes a long time',
+        )
+
     def handle(self, *args, **options):
         """
         Repairs the tree
         """
+        fix_paths = options.get('fix_paths', False)
         self.stdout.write('fixing page tree')
-        TreeNode.fix_tree()
+        TreeNode.fix_tree(fix_paths=fix_paths)
 
         root_nodes = TreeNode.objects.filter(parent__isnull=True)
 
@@ -54,7 +63,7 @@ def handle(self, *args, **options):
             self._update_descendants_tree(root)
 
         self.stdout.write('fixing plugin tree')
-        CMSPlugin.fix_tree()
+        CMSPlugin.fix_tree(fix_paths=fix_paths)
         self.stdout.write('all done')
 
     def _update_descendants_tree(self, root):