Skip to content

Commit

Permalink
fix issue #7745 (#7747)
Browse files Browse the repository at this point in the history
discard specific verbose_name from perms_needed
  • Loading branch information
jrief committed Jan 10, 2024
1 parent fdc3639 commit e0c7550
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions cms/admin/pageadmin.py
Original file line number Diff line number Diff line change
Expand Up @@ -371,12 +371,10 @@ def delete_view(self, request, object_id, extra_context=None):
**get_deleted_objects_additional_kwargs
)

# This is bad and I should feel bad.
if _('placeholder') in perms_needed:
perms_needed.remove('placeholder')

if _('page content') in perms_needed:
perms_needed.remove('page content')
# `django.contrib.admin.utils.get_deleted_objects()` only returns the verbose_name of a model,
# we hence have to use that name in order to allow the deletion of objects otherwise prevented.
perms_needed.discard(Placeholder._meta.verbose_name)
perms_needed.discard(PageContent._meta.verbose_name)

if request.POST and not protected: # The user has confirmed the deletion.
if perms_needed:
Expand Down

0 comments on commit e0c7550

Please sign in to comment.