From 7f3c0f5af00fa061000be5508ed7c5b76e9c93ed Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Wed, 4 Feb 2015 16:56:35 +0000 Subject: [PATCH] Pick up the StreamBlock definition from the model field, so that we don't need to pass it to the StreamFieldPanel constructor --- wagtail/wagtailadmin/edit_handlers.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/wagtail/wagtailadmin/edit_handlers.py b/wagtail/wagtailadmin/edit_handlers.py index 01216e938..9b1a6f8b9 100644 --- a/wagtail/wagtailadmin/edit_handlers.py +++ b/wagtail/wagtailadmin/edit_handlers.py @@ -701,8 +701,6 @@ Page.settings_panels = [ ] -from wagtail.wagtailadmin.blocks import StreamBlock - class BaseStreamFieldPanel(BaseFieldPanel): def classes(self): @@ -727,13 +725,12 @@ class BaseStreamFieldPanel(BaseFieldPanel): return cls.block_def.all_html_declarations() class StreamFieldPanel(object): - def __init__(self, field_name, block_types): + def __init__(self, field_name): self.field_name = field_name - self.block_types = block_types def bind_to_model(self, model): return type(str('_StreamFieldPanel'), (BaseStreamFieldPanel,), { 'model': model, 'field_name': self.field_name, - 'block_def': StreamBlock(self.block_types), + 'block_def': model._meta.get_field(self.field_name).stream_block })