Changeset 715

Timestamp:

09/28/05 23:22:09 (3 years ago)

Author:

adrian

Message:

Fixed #501 -- Fixed block.super in multi-level templates, and added unit tests to confirm. Thanks for the patch, django@kieranholland.com

Files:

• django/trunk/django/core/template_loader.py (modified) (3 diffs)
• django/trunk/tests/othertests/templates.py (modified) (1 diff)

django/trunk/django/core/template_loader.py

@@ -43 +43 @@
-    raise template.TemplateDoesNotExist, ', '.join(template_name_list)
-
-class SuperBlock:
-    "This implements the ability for {{ block.super }} to render the parent block's contents"
-    def __init__(self, context, nodelist):
-        self.context, self.nodelist = context, nodelist
-
-    def super(self):
-        if self.nodelist:
-            return self.nodelist.render(self.context)
-        else:
-            return ''
-
-class BlockNode(template.Node):
-
- = name, nodelis
+, parent=None
+, self.parent = name, nodelist, paren
-
-    def __repr__(self):
@@ -63 +52 @@
-    def render(self, context):
-        context.push()
-
-
+
+
+
-        result = self.nodelist.render(context)
-        context.pop()
-        return result
+
+    def super(self):
+        if self.parent:
+            return self.parent.render(self.context)
+        return ''
+
+    def add_parent(self, nodelist):
+        if self.parent:
+            self.parent.add_parent(nodelist)
+        else:
+            self.parent = BlockNode(self.name, nodelist)
-
-class ExtendsNode(template.Node):
@@ -105 +106 @@
-                    compiled_parent.nodelist[0].nodelist.append(block_node)
-            else:
-
-
+
+
+
-                parent_block.nodelist = block_node.nodelist
-        return compiled_parent.render(context)

django/trunk/tests/othertests/templates.py

@@ -185 +185 @@
-    # {% load %} tag (within a child template)
-    'inheritance19': ("{% extends 'inheritance01' %}{% block first %}{% load testtags %}{% echo 400 %}5678{% endblock %}", {}, '140056783_'),
+
+    # Two-level inheritance with {{ block.super }}
+    'inheritance20': ("{% extends 'inheritance01' %}{% block first %}{{ block.super }}a{% endblock %}", {}, '1_a3_'),
+
+    # Three-level inheritance with {{ block.super }} from parent
+    'inheritance21': ("{% extends 'inheritance02' %}{% block first %}{{ block.super }}a{% endblock %}", {}, '12a34'),
+
+    # Three-level inheritance with {{ block.super }} from grandparent
+    'inheritance22': ("{% extends 'inheritance04' %}{% block first %}{{ block.super }}a{% endblock %}", {}, '1_a3_'),
+
+    # Three-level inheritance with {{ block.super }} from parent and grandparent
+    'inheritance23': ("{% extends 'inheritance20' %}{% block first %}{{ block.super }}b{% endblock %}", {}, '1_ab3_'),
-
-    ### EXCEPTIONS ############################################################