8000 fix: remove `copy_to_public` from page and page content extensions by fsbraun · Pull Request #7604 · django-cms/django-cms · GitHub
[go: up one dir, main page]
Skip to content

fix: remove copy_to_public from page and page content extensions #7604

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 5 commits into from
Aug 4, 2023
Merged

fix: remove copy_to_public from page and page content extensions #7604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b1ba1d3
fix: remove copy_to_public from page and page content extensions
fsbraun Jul 9, 2023
067ad7b
Merge branch 'develop-4' into fix/remove_copy_to_public
fsbraun Jul 9, 2023
67c23d9
Fix: Make `copy_to_public` a no-op issuing a warning
fsbraun Jul 14, 2023
7b4a46f
Merge branch 'fix/remove_copy_to_public' of github.com:fsbraun/django…
fsbraun Jul 14, 2023
0ebef1d
Merge branch 'develop-4' into fix/remove_copy_to_public
fsbraun Aug 4, 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
23 changes: 7 additions & 16 deletions cms/extensions/extension_pool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,35 +51,26 @@ def unregister(self, extension):
except KeyError:
pass

def _copy_page_extensions(self, source_page, target_page, language, clone=False):
def _copy_page_extensions(self, source_page, target_page, language):
for extension in self.page_extensions:
for instance in extension.objects.filter(extended_object=source_page):
if clone:
instance.copy(target_page, language)
else:
instance.copy_to_public(target_page, language)
instance.copy(target_page, language)

def _copy_content_extensions(self, source_page, target_page, language, clone=False):
def _copy_content_extensions(self, source_page, target_page, language):
source_content = source_page.pagecontent_set(manager="admin_manager").get(language=language)
if target_page:
target_title = target_page.pagecontent_set(manager="admin_manager").get(language=language)
else:
target_title = source_content.publisher_public
target_title = target_page.pagecontent_set(manager="admin_manager").get(language=language)
for extension in self.page_content_extensions:
for instance in extension.objects.filter(extended_object=source_content):
if clone:
instance.copy(target_title, language)
else:
instance.copy_to_public(target_title, language)
instance.copy(target_title, language)

def copy_extensions(self, source_page, target_page, languages=None):
if not languages:
languages = target_page.get_languages()
if self.page_extensions:
self._copy_page_extensions(source_page, target_page, None, clone=True)
self._copy_page_extensions(source_page, target_page, None)
for language in languages:
if self.page_content_extensions:
self._copy_content_extensions(source_page, target_page, language, clone=True)
self._copy_content_extensions(source_page, target_page, language)

def get_page_extensions(self, page=None):
extensions = []
Expand Down
47 changes: 11 additions & 36 deletions cms/extensions/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@ def _get_related_objects(cls):

def copy(self, target, language):
"""
This method copies this extension to an unrelated-target. If you intend
to "publish" this extension to the publisher counterpart of target, then
use copy_to_publish() instead.
This method copies this extension to an unrelated-target.
"""
clone = self.__class__.objects.get(pk=self.pk) # get a copy of this instance
clone.pk = None
Expand All @@ -60,40 +58,17 @@ def copy(self, target, language):

def copy_to_public(self, public_object, language):
"""
This method is used to "publish" this extension as part of the a larger
operation on the target. If you intend to copy this extension to an
unrelated object, use copy() instead.
.. warning::

This method used to "publish" this extension as part of the a larger operation on the target.
Publishing pages has been removed from django CMS core in version 4 onward.

For publishing functionality see `djangocms-versioning: <https://github.com/django-cms/djangocms-verisoning>`_
"""
this = self.__class__.objects.get(pk=self.pk) # get a copy of this instance
public_extension = self.public_extension # get the public version of this instance if any

this.extended_object = public_object # set the new public object

if public_extension:
# overwrite current public extension
this.pk = public_extension.pk
# remove public extension, or it will point to itself and raise duplicate entry
this.public_extension = None

# Set public_extension concrete parents PKs. See issue #5494
for parent, field in this._meta.parents.items():
if field:
setattr(this, parent._meta.pk.attname, getattr(public_extension, parent._meta.pk.attname))
else:
this.pk = None # create new public extension

# Nullify all concrete parent primary keys. See issue #5494
for parent, field in this._meta.parents.items():
if field:
setattr(this, parent._meta.pk.attname, None)

this.save()
self.public_extension = this
self.save()

this.copy_relations(self, language)
this.save(force_update=True)
return this
import warnings
warnings.warn('This API function has been removed. For publishing functionality use a package that adds '
'publishing, such as: djangocms-versioning.',
UserWarning, stacklevel=2)


class PageExtension(BaseExtension):
Expand Down
0