Don't assume extends node is first in node list. Closes #4.

This commit is contained in:
Stephen McDonald
2013-12-29 13:25:31 +11:00
parent 036ef58081
commit 9554d4a741
2 changed files with 5 additions and 3 deletions

View File

@@ -102,9 +102,10 @@ class OverExtendsNode(ExtendsNode):
if hasattr(parent, "render"):
return parent
template = self.find_template(parent, context)
if (isinstance(template.nodelist[0], ExtendsNode) and
template.nodelist[0].parent_name.resolve(context) == parent):
return self.find_template(parent, context, peeking=True)
for node in template.nodelist:
if (isinstance(node, ExtendsNode) and
node.parent_name.resolve(context) == parent):
return self.find_template(parent, context, peeking=True)
return template

View File

@@ -13,6 +13,7 @@ from django.test import TestCase
TEST_TEMPLATE = """
{# avast ye mateys #}
%(extends_string)s
{%% block main %%}
%(super_string)s