Skip to content
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.

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

fix djangocms-versioning draft deletion bug (#214) #215

Merged
merged 2 commits into from
Mar 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 13 additions & 1 deletion djangocms_alias/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from cms.utils.permissions import get_model_permission_codename
from cms.utils.urlutils import admin_reverse
from django import forms
from django.contrib import admin
from django.contrib import admin, messages
from django.http import (
Http404,
HttpRequest,
Expand Down Expand Up @@ -190,3 +190,15 @@ def has_module_permission(self, request: HttpRequest) -> bool:
"""Hides admin class in admin site overview"""

return False

def delete_model(self, request: HttpRequest, obj: AliasContent):
if obj.alias._default_manager.filter(language=obj.language).count() == 1:
message = _(
"Alias content for language {} deleted. A new empty alias content will be created if needed."
).format(obj.language)
self.message_user(request, message, level=messages.WARNING)

return super().delete_model(
request=request,
obj=obj,
)
5 changes: 0 additions & 5 deletions djangocms_alias/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -291,11 +291,6 @@ def get_placeholders(self):
def get_template(self):
return "djangocms_alias/alias_content.html"

@transaction.atomic
def delete(self, *args, **kwargs):
super().delete(*args, **kwargs)
self.alias.cms_plugins.filter(language=self.language).delete()

@transaction.atomic
def populate(self, replaced_placeholder=None, replaced_plugin=None, plugins=None):
if not replaced_placeholder and not replaced_plugin:
Expand Down
Loading