Ticket #6646: 6646.2.diff

django/template/loader_tags.py

@@ -87 +87 @@
                         if isinstance(node, ExtendsNode):
                             node.nodelist.append(block_node)
                         # Extends must be the first non-text node, so once you find
-                        # the first non-text node you can stop looking. 
+                        # the first non-text node you can stop looking.
                         break
             else:
                 # Keep any existing parents and add a new one. Used by BlockNode.
@@ -106 +106 @@
                 raise
             self.template = None
 
+    def _get_template(self):
+        return self._template
+
+    def _set_template(self, template):
+        """
+        Set the node's ``template`` attribute, and also update the node's
+        ``nodelist`` attribute (used by ``Node.get_nodes_by_type()``).
+        """
+        self._template = template
+        if template:
+            self.nodelist = self.template.nodelist
+        elif hasattr(self, 'nodelist'):
+            del self.nodelist
+
+    template = property(_get_template, _set_template)
+
     def render(self, context):
         if self.template:
             return self.template.render(context)

tests/regressiontests/templates/tests.py

@@ -802 +802 @@
             # Inheritance from a template with a space in its name should work.
             'inheritance29': ("{% extends 'inheritance 28' %}", {}, '!'),
 
+            # Setup a template to be included by base template
+            'inheritance30': ("{% block included %}2{% endblock %}", {}, '2'),
+
+            # Setup a base template with an include
+            'inheritance31': ("1{% include 'inheritance30' %}3", {}, '123'),
+
+            # Inheritance with overriding a block included by the parent
+            'inheritance32': ("{% extends 'inheritance31' %}{% block included %}&{% endblock %}", {}, '1&3'),
+
+            # Setup a template to be included by child template
+            'inheritance33': ("{% block included %}_{% endblock %}", {}, '_'),
+
+            # Inheritance with overriding a block through an include
+            'inheritance34': ("{% extends 'inheritance30' %}{% include 'inheritance33' %}", {}, '_'),
+
+            # Inheritance with overriding a block included by the parent through an include in the child template (combine 32+34)
+            'inheritance35': ("{% extends 'inheritance31' %}{% include 'inheritance33' %}", {}, '1_3'),
+
             ### I18N ##################################################################
 
             # {% spaceless %} tag