From 0afb1a3b505eeae908ac570d9f9c9f593b5b1b37 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Wed, 4 Feb 2015 19:03:15 +0000 Subject: [PATCH] make StreamField behave correctly for migrations --- wagtail/wagtailadmin/blocks.py | 3 +++ wagtail/wagtailcore/fields.py | 3 +++ 2 files changed, 6 insertions(+) diff --git a/wagtail/wagtailadmin/blocks.py b/wagtail/wagtailadmin/blocks.py index 492b3df9c..d5c184e44 100644 --- a/wagtail/wagtailadmin/blocks.py +++ b/wagtail/wagtailadmin/blocks.py @@ -720,6 +720,9 @@ class BaseStreamBlock(Block): ]) def get_prep_value(self, value): + if value is None: + return None + return [ {'type': bound_block.block.name, 'value': bound_block.block.get_prep_value(bound_block.value)} for bound_block in value.bound_blocks diff --git a/wagtail/wagtailcore/fields.py b/wagtail/wagtailcore/fields.py index 9a59e2da7..7b7820a94 100644 --- a/wagtail/wagtailcore/fields.py +++ b/wagtail/wagtailcore/fields.py @@ -46,6 +46,9 @@ class StreamField(with_metaclass(models.SubfieldBase, models.Field)): self.stream_block = StreamBlock(block_types) super(StreamField, self).__init__(**kwargs) + def get_internal_type(self): + return 'TextField' + def deconstruct(self): name, path, args, kwargs = super(StreamField, self).deconstruct() kwargs['block_types'] = self.block_types