0
0
mirror of https://github.com/wagtail/wagtail.git synced 2024-11-29 17:36:49 +01:00

Wrap deleting page into database transaction

Currently queries executed in the hooks don't run in the transaction
with the page deletion query and it's harder to write hook without
copying the whole view if you want to keep queries running in the hooks
integral with page deletion.
This commit is contained in:
Tomasz Knapik 2018-07-06 14:45:01 +01:00 committed by Matt Westcott
parent 9aa5a3ee76
commit 361def81c2
3 changed files with 21 additions and 17 deletions

View File

@ -10,6 +10,7 @@ Changelog
* EmbedBlock now validates against recognised embed providers on save (Bertrand Bordage)
* Fix: Respect next param on login (Loic Teixeira)
* Fix: InlinePanel now handles relations that specify a related_query_name (Aram Dulyan)
* Fix: before_delete_page / after_delete_page hooks now run within the same database transaction as the page deletion (Tomasz Knapik)
2.2.1 (13.08.2018)

View File

@ -32,6 +32,7 @@ Bug fixes
* Respect next param on login (Loic Teixeira)
* InlinePanel now handles relations that specify a related_query_name (Aram Dulyan)
* before_delete_page / after_delete_page hooks now run within the same database transaction as the page deletion (Tomasz Knapik)
Upgrade considerations

View File

@ -2,6 +2,7 @@ from time import time
from django.contrib.contenttypes.models import ContentType
from django.core.exceptions import PermissionDenied
from django.db import transaction
from django.db.models import Count
from django.http import Http404, HttpResponse, JsonResponse
from django.http.request import QueryDict
@ -541,6 +542,7 @@ def delete(request, page_id):
if not page.permissions_for_user(request.user).can_delete():
raise PermissionDenied
with transaction.atomic():
for fn in hooks.get_hooks('before_delete_page'):
result = fn(request, page)
if hasattr(result, 'status_code'):