10000 fix: Port forward #7664 and #7657 by fsbraun · Pull Request #7695 · django-cms/django-cms · GitHub
[go: up one dir, main page]
Skip to content

fix: Port forward #7664 and #7657 #7695

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Nov 20, 2023
Merged

fix: Port forward #7664 and #7657 #7695

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e2d7748
fix: preserve `view_class` in decorated views (#7664)
Will-Hoey Oct 18, 2023
4f8aee4
Fix tests
fsbraun Nov 19, 2023
d9ce1e5
Bugfix: avoid InvalidCacheKey (memcached) for key-length ~249 (fixes …
wfehr Oct 19, 2023
003b059
Remove docs test from test suite (since covered by separate github ac…
fsbraun Nov 20, 2023
bc5581b
Remove docs requirements from the django-main test
fsbraun Nov 20, 2023
17bcea9
Add setuptools to requirements for python 3.12
fsbraun Nov 20, 2023
f832b81
Add setuptools to requirements.txt
fsbraun Nov 20, 2023
bf362b4
Fix: Test with current ckeditor
fsbraun Nov 20, 2023
42ac56f
Undo unnecessary change
fsbraun Nov 20, 2023
09d8ab8
Fix tests for Django 5.1
fsbraun Nov 20, 2023
9e1f1a5
Fix: Missing output_field
fsbraun Nov 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix: Missing output_field
  • Loading branch information
@fsbraun
fsbraun committed Nov 20, 2023
commit 9e1f1a52f3e7f28a59f59c8d47019eab1e96e5eb
7 changes: 6 additions & 1 deletion cms/models/pagemodel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,12 @@ def set_as_homepage(self, user=None):

def _get_path_sql_value(self, base_path=''):
if base_path:
new_path = Concat(models.Value(base_path), models.Value('/'), models.F('slug'))
new_path = Concat(
models.Value(base_path),
models.Value('/'),
models.F('slug'),
output_field=models.CharField(),
)
elif base_path is None:
new_path = None
else:
Expand Down
0