Merge branch 'develop' into dependabot/pip/test_requirements/pillow-9…

….0.1

.github/workflows/docs.yml

@@ -12,20 +12,22 @@ jobs:
     name: docs
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: '3.9'
           cache: 'pip'
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('docs/requirements.txt') }}
           restore-keys: |
             ${{ runner.os }}-pip-
       - run: python -m pip install -r docs/requirements.txt
+      - run: codespell -w *.rst
+      - run: codespell -w docs
       - name: Build docs
         run: |
           cd docs

.github/workflows/frontend.yml

@@ -14,9 +14,9 @@ jobs:
         node-version: ['16']
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
     - run: npm install

.github/workflows/lint-pr.yml

@@ -0,0 +1,20 @@
+name: "Lint PR"
+
+# Validates PR titles against the conventional commit spec
+# https://github.com/commitizen/conventional-commit-types
+
+on:
+  pull_request_target:
+    types:
+      - opened
+      - edited
+      - synchronize
+
+jobs:
+  main:
+    name: Validate PR title
+    runs-on: ubuntu-latest
+    steps:
+      - uses: amannn/action-semantic-pull-request@v4
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/linters.yml

@@ -12,9 +12,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: 3.9
           cache: 'pip'
@@ -29,9 +29,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: 3.9
           cache: 'pip'

.github/workflows/test.yml

@@ -12,11 +12,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ '3.7', '3.8', '3.9', '3.10']
+        python-version: [ '3.8', '3.9', '3.10']
         requirements-file: [
           django-2.2.txt,
           django-3.1.txt,
           django-3.2.txt,
+          django-4.0.txt,
         ]
         os: [
           ubuntu-20.04,
@@ -35,10 +36,10 @@ jobs:
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
 
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python-version }}
         cache: 'pip'
@@ -64,11 +65,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ '3.7', '3.8', '3.9', '3.10']
+        python-version: [ '3.8', '3.9', '3.10']
         requirements-file: [
           django-2.2.txt,
           django-3.1.txt,
           django-3.2.txt,
+          django-4.0.txt,
         ]
         os: [
           ubuntu-20.04,
@@ -86,10 +88,10 @@ jobs:
 
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
 
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python-version }}
         cache: 'pip'
@@ -115,21 +117,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ '3.7', '3.8', '3.9', '3.10']
+        python-version: [ '3.8', '3.9', '3.10']
         requirements-file: [
           django-2.2.txt,
           django-3.1.txt,
           django-3.2.txt,
+          django-4.0.txt,
         ]
         os: [
           ubuntu-20.04,
         ]
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
 
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python-version }}
         cache: 'pip'

CHANGELOG.rst

@@ -2,11 +2,79 @@
 Changelog
 =========
 
-
 unreleased
 ==========
 
+
+3.10.0 (2022-03-26)
+===================
+
+Highlights:
+-----------
+
+This feature focuses on bringing python 3.10 support, bringing build system to latest nodejs, and bugfixes
+
+Features:
+---------
+* python3.10 support (#7126) (324f08594) -- Vinit Kumar
+* improve build performance (#7192) (bdb04bc31) -- Vinit Kumar
+
+Bug Fixes:
+----------
+* using .nvmrc to target the right nvm version (3e5227def) -- Florian Delizy
+* Add toolbar fix for broken CMS in the release 3.10.x -- Vinit Kumar
+* fixing release script to use 'unreleased' (low caps) instead of mixed caps (#7202) (b7a793c88) -- Florian Delizy
+* Cap django requirement at <4 (#7182) (c6c278497) -- Mark Walker
+* Set the default_auto_field on the AppConfigs (#7181) (272d62ced) -- Jeffrey de Lange
+* do not convert & URL query separator to &amp; (#7114) (c0c10e051) -- nichoski
+* discrepancy around python 3.6 compatibility between `setup.py`, docs and tests (#7095) (70970061f) -- Mark Walker
+* update permission cache when moving pages and adding pages. (#7090) (53dddb106) -- Ryo Shimada
+* https://github.com/django-cms/django-cms/projects/6#card-63761457 (#7085) (a5159d3a6) -- Gabriel Andrade
+* missing tests of django3.2 for mysql and sqlite (#7082) (c7fd7c0c5) -- Vinit Kumar
+* Fixes #7033: also check for Django 3.2, now that 3.9 supports it. (#7054) (#7062) (f4043cd75) -- Vinit Kumar
+
+Statistics:
+-----------
+
+This release includes 59 pull requests, and was created with the help of the following contributors (in alphabetical order):
+
+* Anatoliy (3 pull requests)
+* Angelo Dini (1 pull request)
+* Dmytro Litvinov (1 pull request)
+* Florian Delizy (10 pull requests)
+* Gabriel Andrade (1 pull request)
+* Halit Çelik (1 pull request)
+* Jean-Baptiste PENRATH (1 pull request)
+* Jeffrey de Lange (1 pull request)
+* Jens-Erik Weber (1 pull request)
+* Kaushal Dhungel (1 pull request)
+* Marco Bonetti (2 pull requests)
+* Mark Walker (10 pull requests)
+* Nebojsa Knezevic (2 pull requests)
+* nichoski (2 pull requests)
+* Nicolai (11 pull requests)
+* Ryo Shimada (1 pull request)
+* Simon Krull (4 pull requests)
+* Stefan van den Eertwegh (1 pull request)
+* Vinit Kumar (5 pull requests)
+
+With the review help of the following contributors:
+
+* fsbraun
+* Gabriel Andrade
+* Marco Bonetti
+* Mark Walker
+* Nicolai
+* Simon Krull
+* TiredFingers
+* victor-yunenko
+* Vinit Kumar
+
+Thanks to all contributors for their efforts!
+
+* Added dark mode support to css
 * Fix publishing of static placeholders outside of CMS pages
+* Allow to override the template rendered after a plugin has been saved.
 
 3.9.0 (2021-06-30)
 ==================
@@ -54,7 +122,7 @@ Bug Fixes:
 * Fix styles issues, caused by switching to the ``display: flex`` on the page tree renderer.
 * Fixed missing builtin arguments on main ``cms`` management command causing it to crash
 * Fixed template label nested translation
-* Fixed a bug where the fallback page title whould be returned instead of the one from the current language
+* Fixed a bug where the fallback page title would be returned instead of the one from the current language
 * Fixed an issue when running migrations on a multi database project
 * Fixes #7033: also check for Django 3.2, now that 3.9 supports it. (#7054) (02083f2dc) -- Marco Bonetti
 
@@ -155,7 +223,7 @@ Thanks to all contributors for their efforts!
 * Fixed an issue in ``wizards/create.html`` where the error message did not use the plural form
 * Improved documentation building
 * Updated the content for django CMS’s development community
-* Replaced all occurences of ``force_text`` and ``smart_text`` against
+* Replaced all occurrences of ``force_text`` and ``smart_text`` against
   ``force_str``and ``smart_str``.
 
 
@@ -693,7 +761,7 @@ Thanks to all contributors for their efforts!
 - Substantial improvements to the page tree and significant reduction of reloads
 - Update jsTree version to 3.2.1 with slight adaptions to the Pagetree
 - Documentation improvements
-- Improve the display and useability of the language menu, especially in cases
+- Improve the display and usability of the language menu, especially in cases
   where there are many languages.
 - Fix an issue relating to search fields in plugins
 - Fix an issue where the app-resolver would trigger locales into migrations
@@ -1007,7 +1075,7 @@ Thanks to all contributors for their efforts!
 - Improves redirection as a result of changes to page slugs, etc.
 - Improves performance of "watched models"
 - Improves frontend performance relating to resizing the sideframe
-- Corrects an issue where items might not be visible in structue mode menus
+- Corrects an issue where items might not be visible in structure mode menus
 - Limits version of django-mptt used in CMS for 3.0.x
 - Prevent accidental upgrades to Django 1.8, which is not yet supported
 
@@ -1064,7 +1132,7 @@ Thanks to all contributors for their efforts!
 ==================
 
 - Add require_parent option to CMS_PLACEHOLDER_CONF
-- Fix django-mptt version depenency to be PEP440 compatible
+- Fix django-mptt version dependency to be PEP440 compatible
 - Fix some Django 1.4 compatibility issues
 - Add toolbar sanity check
 - Fix behavior with CMSPluginBase.get_render_template()
@@ -1092,7 +1160,7 @@ Thanks to all contributors for their efforts!
 - Fixes PageField to work in Django 1.7 environments
 - Updates to community and project governance documentation
 - Added list of retired core developers
-- Added branch policy documentaion
+- Added branch policy documentation
 
 
 3.0.6 (2014-10-07)
@@ -1302,7 +1370,7 @@ Please see Install/2.4 release notes *before* attempting to upgrade to version 2
 - CMS_FRONTEND_LANGUAGES limits django languages as well during language selection
 - Wymeditor updated to 1.0.4a
 - icon_url escape fixed
-- Ukranian translation added
+- Ukrainian translation added
 - Fixed wrong language prefix handling for form actions and admin preview
 - Admin icons in django 1.4 fixed
 - Added requirements.txt for pip and testing in test_requirements

CONTRIBUTING.rst

@@ -4,7 +4,7 @@ CONTRIBUTING
 
 First, thank you very much, that you would like to contribute to django CMS.
 We always welcome contributions, like many other open-source projects. We are
-very thankful to the many `present, past and future contributors <https://github.com/django-cms/django-cms/graphs/contributors>`_, to our `community heros <https://github.com/django-cms/django-cms-mgmt/blob/master/community%20heros/list%20of%20community%20heros.md>`_ and to the `members of the django CMS Association <https://github.com/django-cms/django-cms-mgmt/blob/master/association/members.md>`_.
+very thankful to the many `present, past and future contributors <https://github.com/django-cms/django-cms/graphs/contributors>`_, to our `community heroes <https://github.com/django-cms/django-cms-mgmt/blob/master/community%20heros/list%20of%20community%20heros.md>`_ and to the `members of the django CMS Association <https://github.com/django-cms/django-cms-mgmt/blob/master/association/members.md>`_.
 
 
 Code of Conduct
@@ -100,4 +100,4 @@ Sign up for our `Bounty program <https://www.django-cms.org/en/bounty-program/>`
 Join a work group
 =================
 
-As part of the django CMS Association we have formed several `work groups <https://docs.django-cms.org/en/latest/contributing/code.html#>`_ to work together on different django CMS development topics. If you want to become part of contributor team, feel free to join one of our groups. You will meet friendly people and improve your programing skills and make a real difference in the django CMS open source project.
+As part of the django CMS Association we have formed several `work groups <https://docs.django-cms.org/en/latest/contributing/code.html#>`_ to work together on different django CMS development topics. If you want to become part of contributor team, feel free to join one of our groups. You will meet friendly people and improve your programming skills and make a real difference in the django CMS open source project.

cms/__init__.py

@@ -1,6 +1,6 @@
 import django
 
-__version__ = '3.9.0'
+__version__ = '3.10.0'
 
 if django.VERSION < (3, 2):
     default_app_config = 'cms.apps.CMSConfig'

cms/admin/pageadmin.py

@@ -1173,7 +1173,7 @@ def publish_page(self, request, page_id, language):
 
         if 'redirect' in request.GET:
             return HttpResponseRedirect(request.GET['redirect'])
-        referrer = request.META.get('HTTP_REFERER', '')
+        referrer = request.headers.get('Referer', '')
 
         path = admin_reverse("cms_page_changelist")
         if request.GET.get('redirect_language'):

cms/forms/widgets.py

@@ -1,3 +1,5 @@
+from django.apps import apps
+from django.conf import settings
 from django.contrib.auth import get_permission_codename
 from django.contrib.sites.models import Site
 from django.forms.widgets import MultiWidget, Select, TextInput
@@ -50,7 +52,7 @@ def _has_changed(self, initial, data):
         Return True if data differs from initial.
         """
         # For purposes of seeing whether something has changed, None is
-        # the same as an empty string, if the data or inital value we get
+        # the same as an empty string, if the data or initial value we get
         # is None, replace it w/ u''.
         if data is None or (len(data)>=2 and data[1] in [None,'']):
             data_value = u''
@@ -159,12 +161,15 @@ def render(self, name, value, attrs=None, choices=(), renderer=None):
         if hasattr(self, 'user') and (self.user.is_superuser or \
             self.user.has_perm(PageUser._meta.app_label + '.' + get_permission_codename('add', PageUser._meta))):
             # append + icon
-            add_url = admin_reverse('cms_pageuser_add')
+            if settings.AUTH_USER_MODEL:
+                auth_model = apps.get_model(settings.AUTH_USER_MODEL)
+                add_url = admin_reverse(f"{auth_model._meta.app_label}_{auth_model._meta.model_name}_add")
+            else:
+                add_url = admin_reverse('cms_pageuser_add')
             output.append(u'<a href="%s" class="add-another" id="add_id_%s" onclick="return showAddAnotherPopup(this);"> ' % \
                     (add_url, name))
         return mark_safe(u''.join(output))
 
-
 class AppHookSelect(Select):
 
     """Special widget used for the App Hook selector in the Advanced Settings