10000 Fix: django treebeard 4.5.1 compatibility by Aiky30 · Pull Request #6988 · django-cms/django-cms · GitHub
[go: up one dir, main page]
Skip to content

Fix: django treebeard 4.5.1 compatibility #6988

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 2 commits into from
Mar 5, 2021
+4 −3
Merged

Fix: django treebeard 4.5.1 compatibility #6988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb3e2ef
Fix breaking changes
Aiky30 Mar 2, 2021
b322490
Add changelog entry and update compatible versions
Aiky30 Mar 2, 2021
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
2 changes: 1 addition & 1 deletion CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Unreleased
* Remove debug print from apphook_reload
* Enforce use of coverage > 4 for python 3.8 support
* Fixed 66622 bad Title.path in multilingual sites when parent slug is created or modified
* Temporarily pinned django-treebeard to < 4.5, this avoids breaking changes introduced
* Added django-treebeard 4.5.1 support, previously pinned django-treebeard<4.5 to avoid breaking changes introduced
* Updated documentation links

3.8.0 (2020-10-28)
Expand Down
1 change: 1 addition & 0 deletions cms/utils/plugins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ def copy_plugins_to_placeholder(plugins, placeholder, language=None, root_plugin
new_plugin = deepcopy(source_plugin)
new_plugin.pk = None
new_plugin.id = None
new_plugin._state.adding = True
new_plugin.language = language or new_plugin.language
new_plugin.placeholder = placeholder
new_plugin.parent = parent
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
'Django>=2.2',
'django-classy-tags>=0.7.2',
'django-formtools>=2.1',
'django-treebeard>=4.3,<4.5',
'django-treebeard>=4.3',
'django-sekizai>=0.7',
'djangocms-admin-style>=1.2',
]
Expand Down
2 changes: 1 addition & 1 deletion test_requirements/requirements_base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ coverage>=4
python-coveralls>2.5.0
unittest-xml-reporting==1.11.0
Pillow==5.2.0
django-treebeard>=4.3,<4.5
django-treebeard>=4.3
argparse
dj-database-url
djangocms-admin-style>=1.5
Expand Down
0