mirrors/wagtail
mirrors/wagtail
0
0
Fork 0
mirror of https://github.com/wagtail/wagtail.git synced 2024-12-01 11:41:20 +01:00
Code Issues Releases Wiki Activity

Implement construct_from_lookup for StructBlock and StreamBlock

Browse Source
This commit is contained in:
Matt Westcott 2024-06-17 16:00:54 +01:00 committed by Matt Westcott
parent b5bf60da06
commit 18d9bc8422
3 changed files with 67 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wagtail/blocks/stream_block.py
View File

@ -89,6 +89,14 @@ class BaseStreamBlock(Block):
block.set_name(name)
self.child_blocks[name] = block
@classmethod
def construct_from_lookup(cls, lookup, child_blocks, **kwargs):
if child_blocks:
child_blocks = [
(name, lookup.get_block(index)) for name, index in child_blocks
]
return cls(child_blocks, **kwargs)
def empty_value(self, raw_text=None):
return StreamValue(self, [], raw_text=raw_text)

8
wagtail/blocks/struct_block.py
View File

@ -119,6 +119,14 @@ class BaseStructBlock(Block):
block.set_name(name)
self.child_blocks[name] = block
@classmethod
def construct_from_lookup(cls, lookup, child_blocks, **kwargs):
if child_blocks:
child_blocks = [
(name, lookup.get_block(index)) for name, index in child_blocks
]
return cls(child_blocks, **kwargs)
def get_default(self):
"""
Any default value passed in the constructor or self.meta is going to be a dict

52
wagtail/tests/test_blocks.py
View File

@ -5886,7 +5886,7 @@ class TestValidationErrorAsJsonData(TestCase):
class TestBlockDefinitionLookup(TestCase):
def test_get_block_definition(self):
def test_simple_lookup(self):
lookup = BlockDefinitionLookup(
[
("wagtail.blocks.CharBlock", [], {"required": True}),
@ -5910,3 +5910,53 @@ class TestBlockDefinitionLookup(TestCase):
self.assertIsNot(char_block, char_block_2)
self.assertEqual(char_block.name, "title")
self.assertEqual(char_block_2.name, "subtitle")
def test_structblock_lookup(self):
lookup = BlockDefinitionLookup(
[
("wagtail.blocks.CharBlock", [], {"required": True}),
("wagtail.blocks.RichTextBlock", [], {}),
(
"wagtail.blocks.StructBlock",
[
[
("title", 0),
("description", 1),
],
],
{},
),
]
)
struct_block = lookup.get_block(2)
self.assertIsInstance(struct_block, blocks.StructBlock)
title_block = struct_block.child_blocks["title"]
self.assertIsInstance(title_block, blocks.CharBlock)
self.assertTrue(title_block.required)
description_block = struct_block.child_blocks["description"]
self.assertIsInstance(description_block, blocks.RichTextBlock)
def test_streamblock_lookup(self):
lookup = BlockDefinitionLookup(
[
("wagtail.blocks.CharBlock", [], {"required": True}),
("wagtail.blocks.RichTextBlock", [], {}),
(
"wagtail.blocks.StreamBlock",
[
[
("heading", 0),
("paragraph", 1),
],
],
{},
),
]
)
stream_block = lookup.get_block(2)
self.assertIsInstance(stream_block, blocks.StreamBlock)
title_block = stream_block.child_blocks["heading"]
self.assertIsInstance(title_block, blocks.CharBlock)
self.assertTrue(title_block.required)
description_block = stream_block.child_blocks["paragraph"]
self.assertIsInstance(description_block, blocks.RichTextBlock)