diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1b4f675..5a08bd7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,6 +15,7 @@ jobs: dj30_cms37.txt, dj30_cms38.txt, dj31_cms38.txt, + dj40_cms311.txt, ] os: [ ubuntu-20.04, diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 02be05c..595705c 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,7 @@ Changelog Unreleased ========== +* Added support for Django 4.0 * Display page title instead of menu title diff --git a/djangocms_link/models.py b/djangocms_link/models.py index 2b8547b..620a433 100644 --- a/djangocms_link/models.py +++ b/djangocms_link/models.py @@ -6,7 +6,7 @@ from django.contrib.sites.models import Site from django.core.exceptions import ValidationError from django.db import models -from django.utils.encoding import force_text +from django.utils.encoding import force_str from django.utils.translation import gettext from django.utils.translation import gettext_lazy as _ @@ -216,7 +216,7 @@ def clean(self): 'internal_link', ) - anchor_field_verbose_name = force_text( + anchor_field_verbose_name = force_str( self._meta.get_field(anchor_field_name).verbose_name) anchor_field_value = getattr(self, anchor_field_name) @@ -225,7 +225,7 @@ def clean(self): for key in field_names } link_field_verbose_names = { - key: force_text(self._meta.get_field(key).verbose_name) + key: force_str(self._meta.get_field(key).verbose_name) for key in link_fields.keys() } provided_link_fields = { diff --git a/tests/requirements/dj40_cms311.txt b/tests/requirements/dj40_cms311.txt new file mode 100644 index 0000000..cbd14b7 --- /dev/null +++ b/tests/requirements/dj40_cms311.txt @@ -0,0 +1,4 @@ +-r base.txt + +Django>=4.0,<4.1 +django-cms>=3.11,<4.0