mirrors/wagtail
mirrors/wagtail
0
0
Fork 0
mirror of https://github.com/wagtail/wagtail.git synced 2024-11-21 18:09:02 +01:00
Code Issues Releases Wiki Activity

Handle None in ImageBlock.to_python

Browse Source
This commit is contained in:
Matt Westcott 2024-11-14 19:00:55 +00:00
parent 0dd9b7dcb1
commit 58f849a294
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wagtail/images/blocks.py
View File

@ -138,7 +138,7 @@ class ImageBlock(StructBlock):
def to_python(self, value):
# For backward compatibility with ImageChooserBlock
if isinstance(value, int):
if value is None or isinstance(value, int):
image = self.child_blocks["image"].to_python(value)
struct_value = {"image": image, "decorative": False, "alt_text": None}
else:

7
wagtail/images/tests/test_blocks.py
View File

@ -248,6 +248,13 @@ class TestImageBlock(TestImageChooserBlock):
self.assertEqual(result.contextual_alt_text, "Sample text")
self.assertFalse(result.decorative)
def test_to_python_with_none(self):
# Like the test_to_python_with_int case, this can occur when a non-required
# ImageChooserBlock has been changed to an ImageBlock
block = ImageBlock(required=False)
value = block.to_python(None)
self.assertIsNone(value)
def test_bulk_to_python_with_empty_list(self):
block = ImageBlock(required=False)
result = block.bulk_to_python([])