fix: Allow page titles to contain ampersand (&) (#202)

django-cms · Apr 9, 2024 · 2c5ec99 · 2c5ec99
1 parent cb8f95c
commit 2c5ec99
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 2 deletions.
diff --git a/djangocms_frontend/templates/djangocms_frontend.html b/djangocms_frontend/templates/djangocms_frontend.html
@@ -15,7 +15,7 @@
                 <meta property="og:url" content="{{ request.build_absolute_uri|urlencode:"&?" }}"/>
             {% endblock canonical_url %}
             {% block fb_meta %}{% endblock fb_meta %}
-            <title>{% block title %}{% page_attribute "page_title" %}{% endblock %}</title>
+            <title>{% block title %}{{ request.current_page.get_page_title|striptags }}{% endblock %}</title>
             {% block base_css %}{% endblock %}
 {% endspaceless %}{% render_block 'css' %}{% spaceless %}
     {% block page_head %}{% endblock %}

diff --git a/tests/requirements/dj32_cms310.txt b/tests/requirements/dj32_cms310.txt
@@ -2,3 +2,4 @@
 
 Django>=3.2,<3.3
 django-cms>=3.10, <3.11
+djangocms-text-ckeditor
diff --git a/tests/requirements/dj32_cms38.txt b/tests/requirements/dj32_cms38.txt
@@ -3,3 +3,4 @@
 Django>=3.2,<3.3
 django-cms>=3.8,<3.9
 django-treebeard<4.5
+djangocms-text-ckeditor
diff --git a/tests/requirements/dj32_cms39.txt b/tests/requirements/dj32_cms39.txt
@@ -2,3 +2,4 @@
 
 Django>=3.2,<3.3
 django-cms>=3.9,<4.0
+djangocms-text-ckeditor
diff --git a/tests/requirements/dj32_cms41.txt b/tests/requirements/dj32_cms41.txt
@@ -2,7 +2,7 @@
 
 Django>=3.2,<4.0
 django-cms>=4.1rc2
--e git+https://github.com/django-cms/djangocms-text-ckeditor.git@support/4.0.x#egg=djangocms-text-ckeditor
+djangocms-text-ckeditor
 -e git+https://github.com/fsbraun/djangocms-alias.git@master#egg=djangocms-alias
 -e git+https://github.com/fsbraun/djangocms-url-manager.git@master#egg=djangocms-url-manager
 https://github.com/django-cms/djangocms-versioning/tarball/master#egg=djangocms-versioning
diff --git a/tests/requirements/dj40_cms311.txt b/tests/requirements/dj40_cms311.txt
@@ -3,3 +3,4 @@
 django-filer>=2.2
 Django>=4.0,<4.1
 django-cms>=3.11,<4.0
+djangocms-text-ckeditor
diff --git a/tests/requirements/dj40_cms41.txt b/tests/requirements/dj40_cms41.txt
@@ -2,6 +2,7 @@
 
 Django>=4.0,<4.1
 django-cms>=4.1rc2
+djangocms-text-ckeditor
 -e git+https://github.com/fsbraun/djangocms-alias.git@master#egg=djangocms-alias
 -e git+https://github.com/fsbraun/djangocms-url-manager.git@master#egg=djangocms-url-manager
 https://github.com/django-cms/djangocms-versioning/tarball/master#egg=djangocms-versioning
diff --git a/tests/requirements/dj41_cms311.txt b/tests/requirements/dj41_cms311.txt
@@ -3,3 +3,4 @@
 django-filer>=2.2
 Django>=4.1,<4.2
 django-cms>=3.11,<3.12
+djangocms-text-ckeditor
diff --git a/tests/requirements/dj41_cms41.txt b/tests/requirements/dj41_cms41.txt
@@ -5,3 +5,4 @@ django-cms>=4.1
 djangocms-alias>=2.0.0
 djangocms-versioning>=2.0.0
 git+https://github.com/fsbraun/djangocms-url-manager.git@master#egg=djangocms-url-manager
+djangocms-text-ckeditor
diff --git a/tests/requirements/dj42_cms311.txt b/tests/requirements/dj42_cms311.txt
@@ -3,3 +3,4 @@
 django-filer>=2.2
 Django>=4.2,<5
 django-cms>=3.11,<3.12
+djangocms-text-ckeditor
diff --git a/tests/requirements/dj42_cms41.txt b/tests/requirements/dj42_cms41.txt
@@ -5,3 +5,4 @@ django-cms>=4.1rc2
 djangocms-alias>=2.0.0
 djangocms-versioning>=2.0.0
 git+https://github.com/fsbraun/djangocms-url-manager.git@master#egg=djangocms-url-manager
+djangocms-text-ckeditor
diff --git a/tests/requirements/dj50_cms41.txt b/tests/requirements/dj50_cms41.txt
@@ -5,3 +5,4 @@ django-cms>=4.1rc5
 djangocms-alias>=2.0.0
 djangocms-versioning>=2.0.0
 git+https://github.com/fsbraun/djangocms-url-manager.git@master#egg=djangocms-url-manager
+djangocms-text-ckeditor
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,3 +2,4 @@

		Django>=3.2,<3.3
		django-cms>=3.10, <3.11
		djangocms-text-ckeditor