entrouvert
/
combo
16
1
Fork 0
Code Issues Pull Requests 11 Releases Wiki Activity

data: remove parent field from page snapshots (#86627)

This commit is contained in:
Lauréline Guérin 2024-02-13 15:06:58 +01:00
parent b20230d34f
commit 370beb3a84
No known key found for this signature in database
GPG Key ID: 1FAB9B9B4F93D473
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
combo/data/models.py
View File

@ -819,8 +819,9 @@ class PageSnapshot(models.Model):
snapshot.user = request.user
if not deletion:
snapshot.serialization = page.get_serialized_page()
# remove order from serialization
# remove order and parent from serialization
del snapshot.serialization['fields']['order']
del snapshot.serialization['fields']['parent']
else:
snapshot.serialization = {}
snapshot.comment = comment or _('deletion')
@ -851,8 +852,9 @@ class PageSnapshot(models.Model):
return self.load_page(json_page)
def load_page(self, json_page, snapshot=None):
# keep current page order
# keep current page order and parent
json_page['fields']['order'] = self.page.order
json_page['fields']['parent'] = self.page.parent.natural_key() if self.page.parent else None
try:
post_save.disconnect(cell_maintain_page_cell_cache)
post_delete.disconnect(cell_maintain_page_cell_cache)

1
tests/test_pages.py
View File

@ -523,6 +523,7 @@ def test_snapshot_page():
PageSnapshot.take(page)
snapshot = PageSnapshot.objects.get()
assert 'order' not in snapshot.serialization['fields']
assert 'parent' not in snapshot.serialization['fields']
def test_clear_snapshot_pages():