openstack/deb-python-django-compressor
Code Issues Proposed changes

Merge pull request #554 from cbjadwani/Fix_AttributeError_in_offline_compression

Browse Source 
Fix AttributeError in offline compression
This commit is contained in:
Mathieu Pillard
2014-10-15 19:11:44 +02:00
parent a734989e7a ac70fbfb7f
commit 02b57e7699
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compressor/offline/django.py
View File

@@ -54,6 +54,8 @@ def remove_block_nodes(nodelist, block_stack, block_context):
if not block_stack: if not block_stack:
continue continue
node = block_context.get_block(block_stack[-1].name) node = block_context.get_block(block_stack[-1].name)
if not node:
continue
if isinstance(node, BlockNode): if isinstance(node, BlockNode):
expanded_block = expand_blocknode(node, block_stack, block_context) expanded_block = expand_blocknode(node, block_stack, block_context)
new_nodelist.extend(expanded_block) new_nodelist.extend(expanded_block)

5
compressor/tests/test_templates/test_block_super_base_compressed/test_compressor_offline.html
View File

@@ -5,4 +5,9 @@
<script type="text/javascript"> <script type="text/javascript">
alert("this alert shouldn't be alone!"); alert("this alert shouldn't be alone!");
</script> </script>
{% block orphan %}
{{ block.super }}
An 'orphan' block that refers to a non-existent super block.
Contents of this block are ignored.
{% endblock %}
{% endspaceless %}{% endblock %} {% endspaceless %}{% endblock %}