Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-12 09:13:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'feature/streamfield' of github.com:torchbox/wagtail into feature/streamfield

Browse source
This commit is contained in:
Dave Cranwell 2015-02-13 10:38:54 +00:00
commit 8d6b9c2ed2
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
wagtail/wagtailadmin/blocks.py
View file

@ -745,10 +745,13 @@ class BaseStreamBlock(Block):
else:
error_list = None
# drop any child values that are an unrecognised block type
valid_children = [child for child in value if child.block_type in self.child_blocks]
list_members_html = [
self.render_list_member(child.block.name, child.value, "%s-%d" % (prefix, i), i,
self.render_list_member(child.block_type, child.value, "%s-%d" % (prefix, i), i,
errors=error_list[i] if error_list else None)
for (i, child) in enumerate(value)
for (i, child) in enumerate(valid_children)
]
return render_to_string('wagtailadmin/block_forms/stream.html', {
@ -766,7 +769,10 @@ class BaseStreamBlock(Block):
if data['%s-%d-deleted' % (prefix, i)]:
continue
block_type_name = data['%s-%d-type' % (prefix, i)]
child_block = self.child_blocks[block_type_name]
try:
child_block = self.child_blocks[block_type_name]
except KeyError:
continue
values_with_indexes.append(
(
@ -808,6 +814,7 @@ class BaseStreamBlock(Block):
return StreamValue(self, [
(child_data['type'], self.child_blocks[child_data['type']].to_python(child_data['value']))
for child_data in value
if child_data['type'] in self.child_blocks
])
def get_prep_value(self, value):

8
wagtail/wagtailadmin/tests/test_blocks.py
View file

@ -451,7 +451,6 @@ class TestStreamBlock(unittest.TestCase):
self.assertIn('<div class="block-paragraph">My first paragraph</div>', html)
self.assertIn('<div class="block-paragraph">My second paragraph</div>', html)
@unittest.expectedFailure
def test_render_unknown_type(self):
# This can happen if a developer removes a type from their StreamBlock
html = self.render_article([
@ -459,7 +458,14 @@ class TestStreamBlock(unittest.TestCase):
'type': 'foo',
'value': "Hello",
},
{
'type': 'paragraph',
'value': 'My first paragraph',
},
])
self.assertNotIn('foo', html)
self.assertNotIn('Hello', html)
self.assertIn('<div class="block-paragraph">My first paragraph</div>', html)
def render_form(self):
class ArticleBlock(blocks.StreamBlock):