8000 chore: Backport the delete translations fix for #8111 to django CMS 4.1 by fsbraun · Pull Request #8112 · django-cms/django-cms · GitHub
[go: up one dir, main page]
Skip to content

chore: Backport the delete translations fix for #8111 to django CMS 4.1 #8112

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
Jan 22, 2025
Merged

chore: Backport the delete translations fix for #8111 to django CMS 4.1 #8112

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
34a1dc0
backport: Delete translation deletes all page content objects with th…
fsbraun Jan 16, 2025
b7435cd
fix typo
fsbraun Jan 16, 2025
18c58a1
Fix message action
fsbraun Jan 16, 2025
a2da84d
Update cms/admin/pageadmin.py
fsbraun Jan 16, 2025
675bc91
Merge branch 'release/4.1.x' into backport/translation-delete
fsbraun Jan 22, 2025
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
Next Next commit
backport: Delete translation deletes all page content objects with th… 
…e page/language combination
  • Loading branch information
@fsbraun
fsbraun committed Jan 16, 2025
commit 34a1dc07520d23e640e66c18a32999fb637faec7
5 changes: 3 additions & 2 deletions cms/admin/pageadmin.py
Show comments
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1248,6 +1248,7 @@ def delete_view(self, request, object_id, extra_context=None):
page_content = self.get_object(request, object_id=object_id)
page = page_content.page
language = page_content.language
page_contents = PageContent.objects.filter(page=page, langauge=language)
page_url = page.urls.get(language=page_content.language)
request_language = get_site_language_from_request(request, site_id=page.node.site_id)

Expand All @@ -1273,7 +1274,7 @@ def delete_view(self, request, object_id, extra_context=None):
admin_site=self.admin_site,
)[:3]
to_delete_translations, __, perms_needed_translation = get_deleted_objects(
[page_content],
page_contents,
request=request,
admin_site=self.admin_site,
)[:3]
Expand Down Expand Up @@ -1306,7 +1307,7 @@ def delete_view(self, request, object_id, extra_context=None):
messages.success(request, message)

page_url.delete()
page_content.delete()
page_contents.delete()
for p in saved_plugins:
p.delete()

Expand Down
0