Don't assume extends node is first in node list. Closes #4.
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@ from django.test import TestCase
|
||||
|
||||
TEST_TEMPLATE = """
|
||||
|
||||
{# avast ye mateys #}
|
||||
%(extends_string)s
|
||||
{%% block main %%}
|
||||
%(super_string)s
|
||||
|
||||
Reference in New Issue
Block a user